Browse Source

fix 修改定时多线程

Administrator 1 year ago
parent
commit
b76ad443f8

+ 26 - 0
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/MemberInfoServiceImpl.java

@@ -137,6 +137,32 @@ public class MemberInfoServiceImpl implements IMemberInfoService {
         List<ZxActivity> zxActivities = zxActivityMapper.selectZxActivityList(zxActivity);
         if (zxActivities != null) {
             memberInfoVo.setZxActivityList(zxActivities);
+            Map<String, List<ZxActivity>> collectType = zxActivities.stream().collect(Collectors.groupingBy(ZxActivity::getActivityType));
+            List<ZxActivity> activityScdyList = collectType.get(ONE);
+            if (activityScdyList != null){
+                //活动视察调研
+
+                memberInfoVo.setActivityScdyList(activityScdyList);
+            }
+            List<ZxActivity> activityJbList = collectType.get(TWO);
+            if (activityJbList != null){
+                //活动界别
+
+                memberInfoVo.setActivityJbList(activityJbList);
+            }
+            List<ZxActivity> activityLlzList = collectType.get(THR);
+            if (activityLlzList != null){
+                //政协委员工作室
+
+                memberInfoVo.setActivityLlzList(activityLlzList);
+            }
+
+            List<ZxActivity> activityBssList = collectType.get(FOR);
+            if (activityBssList != null){
+                //活动为群众办实事
+
+                memberInfoVo.setActivityBssList(activityBssList);
+            }
         }
         //发言
         ZxSpeak zxSpeak = new ZxSpeak();