From 6b682c53501606e656d4c4812d5a2db1e92a5e74 Mon Sep 17 00:00:00 2001
From: zqy <2522236926@qq.com>
Date: 星期四, 25 四月 2024 22:13:23 +0800
Subject: [PATCH] 修改代码
---
zhang-content/src/main/java/com/ruoyi/domain/Meeting.java | 11 +++++------
ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/EsModel.java | 11 +++++------
zhang-content/src/main/java/com/ruoyi/service/impl/MeetingServiceImpl.java | 12 ++++++------
3 files changed, 16 insertions(+), 18 deletions(-)
diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/EsModel.java b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/EsModel.java
index 0b697dc..a119baa 100644
--- a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/EsModel.java
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/EsModel.java
@@ -8,7 +8,6 @@
import org.springframework.data.elasticsearch.annotations.FieldType;
-import java.sql.Timestamp;
import java.util.Date;
/**
@@ -106,16 +105,16 @@
private int by13;
/** 澶囩敤14 */
- @Field(index = true,type = FieldType.Date,analyzer = "yyyy-MM-dd HH:mm:ss")
+ @Field(index = true,type = FieldType.Date,analyzer = "ik_max_wor")
private Date by14;
/** 澶囩敤15 */
- @Field(index = true,type = FieldType.Date,analyzer = "yyyy-MM-dd HH:mm:ss")
- private Timestamp by15;
+ @Field(index = true,type = FieldType.Date,analyzer = "ik_max_wor")
+ private Date by15;
/** 澶囩敤16 */
- @Field(index = true,type = FieldType.Date,analyzer = "yyyy-MM-dd HH:mm:ss ")
- private Timestamp by16;
+ @Field(index = true,type = FieldType.Date,analyzer = "ik_max_wor ")
+ private Date by16;
}
diff --git a/zhang-content/src/main/java/com/ruoyi/domain/Meeting.java b/zhang-content/src/main/java/com/ruoyi/domain/Meeting.java
index 4bf2f5a..832d8b2 100644
--- a/zhang-content/src/main/java/com/ruoyi/domain/Meeting.java
+++ b/zhang-content/src/main/java/com/ruoyi/domain/Meeting.java
@@ -9,7 +9,6 @@
import lombok.Data;
import org.joda.time.DateTime;
-import java.sql.Timestamp;
import java.util.Date;
@Data
@@ -51,14 +50,14 @@
* 寮�濮嬫椂闂�
*/
@Excel(name = "寮�濮嬫椂闂�")
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date startTime;
/**
* 缁撴潫鏃堕棿
*/
@Excel(name = "缁撴潫鏃堕棿")
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
- private Timestamp endTime;
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ private Date endTime;
/**
@@ -95,8 +94,8 @@
/**
* 鐢熸垚鏃堕棿
*/
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
- private Timestamp createTime;
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ private Date createTime;
}
diff --git a/zhang-content/src/main/java/com/ruoyi/service/impl/MeetingServiceImpl.java b/zhang-content/src/main/java/com/ruoyi/service/impl/MeetingServiceImpl.java
index 9e669ec..957669e 100644
--- a/zhang-content/src/main/java/com/ruoyi/service/impl/MeetingServiceImpl.java
+++ b/zhang-content/src/main/java/com/ruoyi/service/impl/MeetingServiceImpl.java
@@ -201,7 +201,7 @@
//鎿嶄綔es淇敼鏁版嵁
EsModel newModel = new EsModel();
-
+ System.out.println(meeting);
if(meeting.getTitle()!=null){
newModel.setBy1(meeting.getTitle());
}else {
@@ -214,20 +214,20 @@
newModel.setBy2(dataById.getPlace());
}
- if(StringUtils.isEmpty(String.valueOf(meeting.getConPeople()))){
+ if(meeting.getConPeople() != 0){
newModel.setBy8(meeting.getConPeople());
}else {
newModel.setBy8(dataById.getConPeople());
}
- if(StringUtils.isEmpty(String.valueOf(meeting.getPartPeople()))){
+ if(meeting.getPartPeople() != 0){
newModel.setBy9(meeting.getPartPeople());
}else {
newModel.setBy9(dataById.getPartPeople());
}
- if(StringUtils.isEmpty(String.valueOf(meeting.getApplyPerson()))){
+ if(meeting.getApplyPerson() != 0){
newModel.setBy10(meeting.getApplyPerson());
}else {
newModel.setBy10(dataById.getApplyPerson());
@@ -252,7 +252,7 @@
}
- if(StringUtils.isEmpty(String.valueOf(meeting.getIsPlacebrand()))){
+ if(meeting.getIsPlacebrand() != 0 ){
newModel.setBy11(meeting.getIsPlacebrand());
}else {
newModel.setBy11(dataById.getIsPlacebrand());
@@ -270,7 +270,7 @@
newModel.setBy4(dataById.getConnPhone());
}
- if(StringUtils.isEmpty(String.valueOf(meeting.getStatu()))){
+ if(meeting.getStatu() != 0){
newModel.setBy13(meeting.getStatu());
}else {
newModel.setBy13(dataById.getStatu());
--
Gitblit v1.9.1