From a979d3b0f9bb814ffeb014fd210e4dff99462e81 Mon Sep 17 00:00:00 2001
From: zqy <2522236926@qq.com>
Date: 星期五, 26 四月 2024 11:31:04 +0800
Subject: [PATCH] 修改代码
---
zhang-content/src/main/java/com/ruoyi/domain/Meeting.java | 3 ++-
ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/EsModel.java | 3 ++-
zhang-content/src/main/java/com/ruoyi/service/impl/MeetingServiceImpl.java | 17 +++++++++--------
3 files changed, 13 insertions(+), 10 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 a119baa..5a93b8c 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,6 +8,7 @@
import org.springframework.data.elasticsearch.annotations.FieldType;
+import java.sql.Timestamp;
import java.util.Date;
/**
@@ -114,7 +115,7 @@
/** 澶囩敤16 */
@Field(index = true,type = FieldType.Date,analyzer = "ik_max_wor ")
- private Date by16;
+ private Timestamp 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 832d8b2..fc26062 100644
--- a/zhang-content/src/main/java/com/ruoyi/domain/Meeting.java
+++ b/zhang-content/src/main/java/com/ruoyi/domain/Meeting.java
@@ -9,6 +9,7 @@
import lombok.Data;
import org.joda.time.DateTime;
+import java.sql.Timestamp;
import java.util.Date;
@Data
@@ -95,7 +96,7 @@
* 鐢熸垚鏃堕棿
*/
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
- private Date createTime;
+ private Timestamp 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 957669e..71a1057 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
@@ -187,14 +187,14 @@
zfLog.setModule("浼氳");
zfLog.setUpdater(zInfoUserService.getMyself().getNickName());
zfLogService.save(zfLog);
-
+ System.out.println("===================================="+meeting);
if(updateById(meeting)){
//鍒版暟鎹簱涓煡璇㈠搴旂殑鏁版嵁
Meeting dataById = getById(meeting.getId());
//鍏堝埌es涓煡璇㈠埌瀵瑰簲閭ｆ潯鏁版嵁鍦╡s鐨刬d
EsModel esResult = esSer.findByCtId(dataById.getId().intValue(), "浼氳");
-
+ System.out.println("===================================="+meeting);
if (esResult == null){
return AjaxResult.success();
}
@@ -202,6 +202,7 @@
//鎿嶄綔es淇敼鏁版嵁
EsModel newModel = new EsModel();
System.out.println(meeting);
+ System.out.println("=============="+meeting.getConnPhone());
if(meeting.getTitle()!=null){
newModel.setBy1(meeting.getTitle());
}else {
@@ -214,13 +215,13 @@
newModel.setBy2(dataById.getPlace());
}
- if(meeting.getConPeople() != 0){
+ if(StringUtils.isNotEmpty(String.valueOf(meeting.getConPeople()))){
newModel.setBy8(meeting.getConPeople());
}else {
newModel.setBy8(dataById.getConPeople());
}
- if(meeting.getPartPeople() != 0){
+ if(meeting.getPartPeople() == 0){
newModel.setBy9(meeting.getPartPeople());
}else {
newModel.setBy9(dataById.getPartPeople());
@@ -239,13 +240,13 @@
newModel.setBy3(dataById.getApplyApart());
}
- if(StringUtils.isEmpty(String.valueOf(meeting.getStartTime()))){
+ if(String.valueOf(meeting.getStartTime()) != null){
newModel.setBy14(meeting.getStartTime());
}else {
newModel.setBy14(dataById.getStartTime());
}
- if(StringUtils.isEmpty(String.valueOf(meeting.getEndTime()))){
+ if(String.valueOf(meeting.getEndTime()) != null){
newModel.setBy15(meeting.getEndTime());
}else {
newModel.setBy15(dataById.getEndTime());
@@ -276,7 +277,7 @@
newModel.setBy13(dataById.getStatu());
}
- if(StringUtils.isEmpty(String.valueOf(meeting.getCreateTime()))){
+ if(String.valueOf(meeting.getCreateTime()) !=null){
newModel.setBy16(meeting.getCreateTime());
}else {
newModel.setBy16(dataById.getCreateTime());
@@ -407,7 +408,7 @@
esModel.setBy12(meeting.getConnPerson());
esModel.setBy4(meeting.getConnPhone());
esModel.setBy13(meeting.getStatu());
- esModel.setBy16(meeting.getCreateTime());
+ esModel.setBy16( meeting.getCreateTime());
//杩欓噷瀛樺偍鏌ヨ璇︽儏鐨勮矾寰�
esModel.setBy5("/zMeeting");
// esModel.setFid(familyId);
--
Gitblit v1.9.1