From 3ea4e6f426596aef381c6753058398d3d4515a6f Mon Sep 17 00:00:00 2001
From: zqy <2522236926@qq.com>
Date: 星期二, 30 四月 2024 21:37:54 +0800
Subject: [PATCH] 提交会议统计

---
 zhang-content/src/main/java/com/ruoyi/service/impl/MeetingStatisticServiceImpl.java |   43 ++++++++++++++++++++-----------------------
 1 files changed, 20 insertions(+), 23 deletions(-)

diff --git a/zhang-content/src/main/java/com/ruoyi/service/impl/MeetingStatisticServiceImpl.java b/zhang-content/src/main/java/com/ruoyi/service/impl/MeetingStatisticServiceImpl.java
index f35eedc..b099b67 100644
--- a/zhang-content/src/main/java/com/ruoyi/service/impl/MeetingStatisticServiceImpl.java
+++ b/zhang-content/src/main/java/com/ruoyi/service/impl/MeetingStatisticServiceImpl.java
@@ -20,9 +20,6 @@
 import java.util.Arrays;
 import java.util.List;
 import java.util.UUID;
-import java.util.stream.Collectors;
-
-import static com.ruoyi.constant.MenuAuthority.EVENT_LIST_ADD;
 
 
 @Slf4j
@@ -65,7 +62,7 @@
     public AjaxResult updateData(MeetingStatistic meetingStatistic) {
         ZfLog zfLog = new ZfLog();
         zfLog.setUpdateTime(LocalDateTime.now());
-        zfLog.setModule("浼氳瀹℃壒");
+        zfLog.setModule("浼氳缁熻");
         zfLog.setUpdater(zInfoUserService.getMyself().getNickName());
         zfLogService.save(zfLog);
         System.out.println("===================================="+meetingStatistic);
@@ -74,7 +71,7 @@
             MeetingStatistic dataById = getById(meetingStatistic.getId());
 
             //鍏堝埌es涓煡璇㈠埌瀵瑰簲閭f潯鏁版嵁鍦╡s鐨刬d
-            EsModel esResult = esSer.findByCtId(dataById.getId().intValue(), "浼氳");
+            EsModel esResult = esSer.findByCtId(dataById.getId().intValue(), "浼氳缁熻");
             System.out.println("===================================="+meetingStatistic);
             if (esResult == null){
                 return AjaxResult.success();
@@ -139,7 +136,7 @@
         if (meetingStatisticService.removeByIds(Arrays.asList(ids))) {
             //鍒犻櫎es涓殑鏁版嵁
             meetings.stream().forEach(meeting -> {
-                EsModel esModel = esSer.findByCtId((meeting.getId().intValue()), "浼氳");
+                EsModel esModel = esSer.findByCtId((meeting.getId().intValue()), "浼氳缁熻");
                 if (esModel != null){
                     DeleteRequest deleteRequest = new DeleteRequest("allsearchdata", esModel.getId());
                     try {
@@ -168,23 +165,23 @@
         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 (meetingStatistic.getFamilyId()!=null && !familyIdList.contains(meetingStatistic.getFamilyId())) {
-            throw new RuntimeException("浣犳病鏈夋潈闄愭搷浣滄瀹跺涵鐨勬暟鎹�");
-        }
-
-
-        if(meetingStatistic.getFamilyId() == null){
-            //榛樿娣诲姞鑷繁瀹跺涵鐨勬暟鎹�
-            meetingStatistic.setFamilyId(familyId);
-        }
+//        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 (meetingStatistic.getFamilyId()!=null && !familyIdList.contains(meetingStatistic.getFamilyId())) {
+//            throw new RuntimeException("浣犳病鏈夋潈闄愭搷浣滄瀹跺涵鐨勬暟鎹�");
+//        }
+//
+//
+//        if(meetingStatistic.getFamilyId() == null){
+//            //榛樿娣诲姞鑷繁瀹跺涵鐨勬暟鎹�
+//            meetingStatistic.setFamilyId(familyId);
+//        }
 
         //鍒ゆ柇鏄惁鏈夐噸澶嶆暟鎹�
         LambdaQueryWrapper<MeetingStatistic> lqw = uniqueCondition(meetingStatistic);

--
Gitblit v1.9.1