فهرست منبع

fix 修改计算加分

Administrator 1 سال پیش
والد
کامیت
91d4b8aa5b
1فایلهای تغییر یافته به همراه5 افزوده شده و 0 حذف شده
  1. 5 0
      ruoyi-system/src/main/java/com/ruoyi/system/service/impl/MemberInfoServiceImpl.java

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

@@ -232,21 +232,25 @@ public class MemberInfoServiceImpl implements IMemberInfoService {
             if (activityScdyList != null){
                 //活动视察调研
                 map.put("activityScdyNum", activityScdyList.size());
+                memberInfoVo.setActivityScdyList(activityScdyList);
             }
             List<ZxActivity> activityLlzList = collectType.get(THR);
             if (activityLlzList != null){
                 //活动联络组
                 map.put("activityLlzNum", activityLlzList.size());
+                memberInfoVo.setActivityLlzList(activityLlzList);
             }
             List<ZxActivity> activityJbList = collectType.get(THR);
             if (activityJbList != null){
                 //活动界别
                 map.put("activityJbNum", activityJbList.size());
+                memberInfoVo.setActivityJbList(activityJbList);
             }
             List<ZxActivity> activityBssList = collectType.get(THR);
             if (activityBssList != null){
                 //活动为群众办实事
                 map.put("activityBssNum", activityBssList.size());
+                memberInfoVo.setActivityBssList(activityBssList);
             }
         }
 
@@ -264,6 +268,7 @@ public class MemberInfoServiceImpl implements IMemberInfoService {
         zxInvestment.setUserId(userId);
         List<ZxInvestment> zxInvestments = zxInvestmentMapper.selectZxInvestmentList(zxInvestment);
         if (zxInvestments != null){
+            map.put("investmentNum", zxInvestments.size());
             memberInfoVo.setZxInvestmentList(zxInvestments);
         }
         //查询委员得分和排名