From b02beccf4567068cb47a3f1181a00039456c872d Mon Sep 17 00:00:00 2001 From: zqy <2522236926@qq.com> Date: 星期三, 06 八月 2025 15:37:20 +0800 Subject: [PATCH] 用户修改姓名和电话同步修改uaid --- zhang-content/src/main/java/com/ruoyi/service/impl/MeetingServiceImpl.java | 185 +++++++++++++++++++++++++++++---------------- 1 files changed, 119 insertions(+), 66 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 5eec8e2..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 @@ -24,9 +24,6 @@ import java.io.IOException; import java.time.LocalDateTime; import java.util.*; -import java.util.stream.Collectors; - -import static com.ruoyi.constant.MenuAuthority.*; @Slf4j @Service @@ -52,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()); @@ -73,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; } @@ -116,7 +111,7 @@ public List<Meeting> selectByCondition(Meeting meeting) { //瑕佹煡鑷繁瀹跺涵鐨� ZInfoUser myself = zInfoUserService.getMyself(); - System.out.println("================"); +// System.out.println("================"); // Long familyId = myself.getFamilyId(); // @@ -183,73 +178,121 @@ //鎿嶄綔鍚庡姞鍏ユ棩蹇� 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涓煡璇㈠埌瀵瑰簲閭f潯鏁版嵁鍦╡s鐨刬d EsModel esResult = esSer.findByCtId(dataById.getId().intValue(), "浼氳"); - +// System.out.println("===================================="+meeting); if (esResult == null){ return AjaxResult.success(); } //鎿嶄綔es淇敼鏁版嵁 EsModel newModel = new EsModel(); - if(meeting.getPlace()!=null){ - newModel.setBy1(meeting.getPlace()); - }else { - newModel.setBy1(dataById.getPlace()); - } - - if(meeting.getApplyApart()!=null){ - newModel.setBy2(meeting.getApplyApart()); - }else { - newModel.setBy2(dataById.getApplyApart()); - } - +// System.out.println(meeting); +// System.out.println("=============="+meeting.getConnPhone()); if(meeting.getTitle()!=null){ - newModel.setBy3(meeting.getTitle()); + newModel.setBy1(meeting.getTitle()); }else { - newModel.setBy3(dataById.getTitle()); - } - if(meeting.getConnPhone()!=null){ - newModel.setBy4(meeting.getConnPhone()); - }else { - newModel.setBy4(dataById.getConnPhone()); + newModel.setBy1(dataById.getTitle()); } - if(StringUtils.isEmpty(String.valueOf(meeting.getApplyPerson()))){ - newModel.setBy5(String.valueOf(meeting.getApplyPerson())); + if(meeting.getPlace()!=null){ + newModel.setBy2(meeting.getPlace()); }else { - newModel.setBy5(String.valueOf(dataById.getApplyPerson())); + newModel.setBy2(dataById.getPlace()); } +// +// 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(StringUtils.isEmpty(String.valueOf(meeting.getPartPeople()))){ - newModel.setBy6(String.valueOf(meeting.getPartPeople())); - }else { - newModel.setBy6(String.valueOf(dataById.getPartPeople())); - } - if(StringUtils.isEmpty(String.valueOf(meeting.getConnPerson()))){ - newModel.setBy7(String.valueOf(meeting.getConnPerson())); - }else { - newModel.setBy7(String.valueOf(dataById.getConnPerson())); - } +// 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.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(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.getBy3(), - "by4",newModel.getBy4(), - "by6",newModel.getBy6(), - "by7",newModel.getBy7() + //"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() + ); try { @@ -311,16 +354,19 @@ @Override public AjaxResult addData(Meeting meeting) { - ZInfoUser myself = zInfoUserService.getMyself(); - Long familyId = myself.getFamilyId(); - - if(familyId == null){ - throw new RuntimeException("鎮ㄨ繕鏈姞鍏ヤ换浣曞搴�"); - } - - List<ZAuthority> authority = zAuthorityService.getAuthority(); - List<Long> familyIdList = authority.stream().filter(auth -> auth.getAuthority().toString().equals(EVENT_LIST_ADD)).map(ZAuthority::getFid).collect(Collectors.toList()); - familyIdList.add(familyId); +// System.out.println("-----------------000000000000"); +// +// System.out.println(meeting.getStartTime()); +// ZInfoUser myself = zInfoUserService.getMyself(); +// Long familyId = myself.getFamilyId(); +// +// if(familyId == null){ +// throw new RuntimeException("鎮ㄨ繕鏈姞鍏ヤ换浣曞搴�"); +// } +// +// List<ZAuthority> authority = zAuthorityService.getAuthority(); +// List<Long> familyIdList = authority.stream().filter(auth -> auth.getAuthority().toString().equals(EVENT_LIST_ADD)).map(ZAuthority::getFid).collect(Collectors.toList()); +// familyIdList.add(familyId); // if (meeting.getFamilyId()!=null && !familyIdList.contains(zfEvent.getFamilyId())) { // throw new RuntimeException("浣犳病鏈夋潈闄愭搷浣滄瀹跺涵鐨勬暟鎹�"); @@ -347,17 +393,24 @@ esModel.setId(uuid); esModel.setCtId(Long.valueOf(inte)); esModel.setCtTableName("浼氳璁板綍"); - esModel.setBy1(meeting.getPlace()); - esModel.setBy2(meeting.getApplyApart()); - esModel.setBy3(meeting.getTitle()); - esModel.setBy4(meeting.getConnPhone()); - esModel.setBy5(String.valueOf(meeting.getApplyPerson())); - esModel.setBy6(String.valueOf(meeting.getPartPeople())); - esModel.setBy7(String.valueOf(meeting.getConnPerson())); + 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.setBy5("/zMeeting"); // esModel.setFid(familyId); esSer.insertTable(esModel); +// System.out.println(esModel); return AjaxResult.success(); } else { @@ -365,4 +418,4 @@ } } -} +} \ No newline at end of file -- Gitblit v1.9.1