From 86d65e6f837ff14b090ffc3312c013987b6f67d8 Mon Sep 17 00:00:00 2001
From: zqy <2522236926@qq.com>
Date: 星期二, 14 十月 2025 21:59:13 +0800
Subject: [PATCH] 荣誉 新增两个字段的查询
---
zhang-content/src/main/java/com/ruoyi/service/impl/MeetingServiceImpl.java | 200 ++++++++++++++++++++++++-------------------------
1 files changed, 99 insertions(+), 101 deletions(-)
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..52677ae 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
@@ -22,12 +22,8 @@
import javax.annotation.Resource;
import java.io.IOException;
-import java.sql.Timestamp;
import java.time.LocalDateTime;
import java.util.*;
-import java.util.stream.Collectors;
-
-import static com.ruoyi.constant.MenuAuthority.*;
@Slf4j
@Service
@@ -53,13 +49,11 @@
private LambdaQueryWrapper<Meeting> buildCondition(Meeting meeting) {
LambdaQueryWrapper<Meeting> lqw = new LambdaQueryWrapper<>();
- // lqw.in(ZfDoctor::getFamilyId,familyIdList);
- lqw.orderByDesc(Meeting::getCreateTime);
+ // lqw.in(ZfDoctor::getFamilyId,familyIdList);
+ lqw.orderByDesc(Meeting::getId);
lqw.like(StringUtils.isNotEmpty(meeting.getPlace()), Meeting::getPlace, meeting.getPlace())
.like(StringUtils.isNotEmpty(meeting.getApplyApart()), Meeting::getApplyApart, meeting.getApplyApart());
// .like(Integer.valueOf(meeting.getApplyPerson())!=null, Meeting::getApplyPerson, meeting.getApplyPerson());
-
-
lqw.between(meeting.getHappenStartTime() != null && meeting.getHappenEndTime() != null, Meeting::getStartTime, meeting.getHappenStartTime(), meeting.getHappenEndTime());
@@ -74,7 +68,7 @@
// lqw.eq(meeting.getFamilyId()!=null,Meeting::getFamilyId,meeting.getFamilyId());
lqw.eq(!StringUtils.isEmpty(String.valueOf(meeting.getApplyPerson())), Meeting::getApplyPerson, meeting.getApplyPerson());
lqw.eq(!StringUtils.isEmpty(String.valueOf(meeting.getPartPeople())), Meeting::getPartPeople, meeting.getPartPeople());
- lqw.eq(!StringUtils.isEmpty(String.valueOf(meeting.getConnPerson())), Meeting::getConnPerson, meeting.getConnPerson());
+ lqw.eq(!StringUtils.isEmpty(meeting.getConnPerson()), Meeting::getConnPerson, meeting.getConnPerson());
return lqw;
}
@@ -117,7 +111,7 @@
public List<Meeting> selectByCondition(Meeting meeting) {
//瑕佹煡鑷繁瀹跺涵鐨�
ZInfoUser myself = zInfoUserService.getMyself();
- System.out.println("================");
+// System.out.println("================");
// Long familyId = myself.getFamilyId();
//
@@ -184,24 +178,25 @@
//鎿嶄綔鍚庡姞鍏ユ棩蹇�
ZfLog zfLog = new ZfLog();
zfLog.setUpdateTime(LocalDateTime.now());
- zfLog.setModule("浼氳");
+ 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();
}
//鎿嶄綔es淇敼鏁版嵁
EsModel newModel = new EsModel();
- System.out.println(meeting);
+// System.out.println(meeting);
+// System.out.println("=============="+meeting.getConnPhone());
if(meeting.getTitle()!=null){
newModel.setBy1(meeting.getTitle());
}else {
@@ -213,90 +208,90 @@
}else {
newModel.setBy2(dataById.getPlace());
}
-
- if(meeting.getConPeople() != 0){
- newModel.setBy8(meeting.getConPeople());
- }else {
- newModel.setBy8(dataById.getConPeople());
- }
-
- if(meeting.getPartPeople() != 0){
- newModel.setBy9(meeting.getPartPeople());
- }else {
- newModel.setBy9(dataById.getPartPeople());
- }
+//
+// if(StringUtils.isNotEmpty(String.valueOf(meeting.getConPeople()))){
+// newModel.setBy8(meeting.getConPeople());
+// }else {
+// newModel.setBy8(dataById.getConPeople());
+// }
+//
+// if(meeting.getPartPeople() == 0){
+// newModel.setBy9(meeting.getPartPeople());
+// }else {
+// newModel.setBy9(dataById.getPartPeople());
+// }
- if(meeting.getApplyPerson() != 0){
- newModel.setBy10(meeting.getApplyPerson());
- }else {
- newModel.setBy10(dataById.getApplyPerson());
- }
+// if(meeting.getApplyPerson() != 0){
+// newModel.setBy10(meeting.getApplyPerson());
+// }else {
+// newModel.setBy10(dataById.getApplyPerson());
+// }
+//
+// if(meeting.getApplyApart()!=null){
+// newModel.setBy3(meeting.getApplyApart());
+// }else {
+// newModel.setBy3(dataById.getApplyApart());
+// }
+//
+// if(String.valueOf(meeting.getStartTime()) != null){
+// newModel.setBy14(meeting.getStartTime());
+// }else {
+// newModel.setBy14(dataById.getStartTime());
+// }
+//
+// if(String.valueOf(meeting.getEndTime()) != null){
+// newModel.setBy15(meeting.getEndTime());
+// }else {
+// newModel.setBy15(dataById.getEndTime());
+// }
- if(meeting.getApplyApart()!=null){
- newModel.setBy3(meeting.getApplyApart());
- }else {
- newModel.setBy3(dataById.getApplyApart());
- }
+//
+// if(meeting.getIsPlacebrand() != 0 ){
+// newModel.setBy11(meeting.getIsPlacebrand());
+// }else {
+// newModel.setBy11(dataById.getIsPlacebrand());
+// }
+//
+// if(meeting.getConnPhone()!=null){
+// newModel.setBy12(meeting.getConnPerson());
+// }else {
+// newModel.setBy12(dataById.getConnPerson());
+// }
- if(StringUtils.isEmpty(String.valueOf(meeting.getStartTime()))){
- newModel.setBy14(meeting.getStartTime());
- }else {
- newModel.setBy14(dataById.getStartTime());
- }
+// if(meeting.getConnPhone()!=null){
+// newModel.setBy4(meeting.getConnPhone());
+// }else {
+// newModel.setBy4(dataById.getConnPhone());
+// }
+//
+// if(meeting.getStatu() != 0){
+// newModel.setBy13(meeting.getStatu());
+// }else {
+// newModel.setBy13(dataById.getStatu());
+// }
- if(StringUtils.isEmpty(String.valueOf(meeting.getEndTime()))){
- newModel.setBy15(meeting.getEndTime());
- }else {
- newModel.setBy15(dataById.getEndTime());
- }
-
-
- if(meeting.getIsPlacebrand() != 0 ){
- newModel.setBy11(meeting.getIsPlacebrand());
- }else {
- newModel.setBy11(dataById.getIsPlacebrand());
- }
-
- if(meeting.getConnPhone()!=null){
- newModel.setBy12(meeting.getConnPerson());
- }else {
- newModel.setBy12(dataById.getConnPerson());
- }
-
- if(meeting.getConnPhone()!=null){
- newModel.setBy4(meeting.getConnPhone());
- }else {
- newModel.setBy4(dataById.getConnPhone());
- }
-
- if(meeting.getStatu() != 0){
- newModel.setBy13(meeting.getStatu());
- }else {
- newModel.setBy13(dataById.getStatu());
- }
-
- if(StringUtils.isEmpty(String.valueOf(meeting.getCreateTime()))){
- newModel.setBy16(meeting.getCreateTime());
- }else {
- newModel.setBy16(dataById.getCreateTime());
- }
+// if(String.valueOf(meeting.getCreateTime()) !=null){
+// newModel.setBy16(meeting.getCreateTime());
+// }else {
+// newModel.setBy16(dataById.getCreateTime());
+// }
UpdateRequest updateRequest = new UpdateRequest("allsearchdata", esResult.getId());
updateRequest.doc(
"by1",newModel.getBy1(),
"by2",newModel.getBy2(),
- "by3",newModel.getBy8(),
- "by4",newModel.getBy9(),
- "by5",newModel.getBy10(),
- "by6",newModel.getBy11(),
- "by7",newModel.getBy3(),
- "by8",newModel.getBy14(),
- "by9",newModel.getBy15(),
- "by10",newModel.getBy12(),
- "by11",newModel.getBy4(),
- "by12",newModel.getBy13(),
- "by13",newModel.getBy15()
+ //"by3",newModel.getBy8(),
+ // "by4",newModel.getBy9(),
+ "by5",newModel.getBy10()
+ // "by6",newModel.getBy11(),
+ // "by7",newModel.getBy3(),
+ // "by8",newModel.getBy14(),
+ // "by9",newModel.getBy15(),
+ // "by10",newModel.getBy12(),
+ // "by11",newModel.getBy4(),
+ // "by12",newModel.getBy13(),
+ // "by13",newModel.getBy15()
);
@@ -359,6 +354,9 @@
@Override
public AjaxResult addData(Meeting meeting) {
+// System.out.println("-----------------000000000000");
+//
+// System.out.println(meeting.getStartTime());
// ZInfoUser myself = zInfoUserService.getMyself();
// Long familyId = myself.getFamilyId();
//
@@ -397,22 +395,22 @@
esModel.setCtTableName("浼氳璁板綍");
esModel.setBy1(meeting.getTitle());
esModel.setBy2(meeting.getPlace());
- esModel.setBy8(meeting.getConPeople());
- esModel.setBy9(meeting.getPartPeople());
- esModel.setBy10(meeting.getApplyPerson());
- esModel.setBy3(meeting.getApplyApart());
- esModel.setBy14(meeting.getStartTime());
- esModel.setBy15(meeting.getEndTime());
- esModel.setBy11(meeting.getIsPlacebrand());
- esModel.setBy12(meeting.getConnPerson());
- esModel.setBy4(meeting.getConnPhone());
- esModel.setBy13(meeting.getStatu());
- esModel.setBy16(meeting.getCreateTime());
+ // esModel.setBy8(meeting.getConPeople());
+ // esModel.setBy9(meeting.getPartPeople());
+ // esModel.setBy10(meeting.getApplyPerson());
+ // esModel.setBy3(meeting.getApplyApart());
+ // esModel.setBy14(meeting.getStartTime());
+ // esModel.setBy15(meeting.getEndTime());
+ // esModel.setBy11(meeting.getIsPlacebrand());
+ // esModel.setBy12(meeting.getConnPerson());
+ // esModel.setBy4(meeting.getConnPhone());
+ // esModel.setBy13(meeting.getStatu());
+ // esModel.setBy16( meeting.getCreateTime());
//杩欓噷瀛樺偍鏌ヨ璇︽儏鐨勮矾寰�
esModel.setBy5("/zMeeting");
// esModel.setFid(familyId);
esSer.insertTable(esModel);
- System.out.println(esModel);
+// System.out.println(esModel);
return AjaxResult.success();
} else {
@@ -420,4 +418,4 @@
}
}
-}
+}
\ No newline at end of file
--
Gitblit v1.9.1