Merge remote-tracking branch 'origin/dev_bugfix_318_wangc' into dev_bugfix_318_wangc

epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueVoteStatisticalServiceImpl.java

@@ -258,6 +258,7 @@ public class IssueVoteStatisticalServiceImpl extends BaseServiceImpl<IssueVoteSt
     @Transactional(rollbackFor = Exception.class)
     public void syncVotingCacheToDb() {
         IssueDTO issueParam = new IssueDTO();
+        // 表决中
         issueParam.setIssueStatus(ModuleConstants.ISSUE_STATUS_VOTING);
         //获取所有voting的议题
         Set<IssueDTO> issues =
@@ -265,18 +266,20 @@ public class IssueVoteStatisticalServiceImpl extends BaseServiceImpl<IssueVoteSt
         if(null == issues || issues.isEmpty()){
             return;
         }
+        // 议题ID集合
         Set<String> ids = issues.stream().map(IssueDTO::getId).collect(Collectors.toSet());
 
         List<String> gridIds = issues.stream().map(IssueDTO::getGridId).distinct().collect(Collectors.toList());
         CommonGridIdListFormDTO gridIdList = new CommonGridIdListFormDTO();
         gridIdList.setGridIds(gridIds);
+        // 根据网格Id查询网格下所有加入组的组员
         Result<GridVotableCountResultDTO> votableCountResult = resiGroupFeignClient.votableCounts(gridIdList);
         Map<String,Integer> votableCountMap1 = null;
         if(votableCountResult.success() && null != votableCountResult.getData() && null != votableCountResult.getData().getVotableCountMap()){
             votableCountMap1 = votableCountResult.getData().getVotableCountMap();
         }
         final Map<String,Integer> votableCountMap = votableCountMap1;
-
+        //查询指定议题的统计数据
         List<IssueVoteStatisticalDTO> statisticalList =
                 baseDao.selectListByIds(ids);
         if (null != statisticalList && statisticalList.size() > NumConstant.ZERO) {

epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/member/service/impl/ResiGroupMemberServiceImpl.java

@@ -814,9 +814,11 @@ public class ResiGroupMemberServiceImpl extends BaseServiceImpl<ResiGroupMemberD
 		}
 		GridVotableCountResultDTO result = new GridVotableCountResultDTO();
 		Map<String,Integer> votableCountMap = new HashMap<>();
+		// 给每个网格初始化 加入小组人数：0
 		gridList.getGridIds().forEach(gridId -> {
 			votableCountMap.put(gridId, NumConstant.ZERO );
 		});
+		// 查询 每个网格的人数 STATE = approved的
 		List<VotableCountResultDTO> list = baseDao.getMembersCountInGrids(gridList.getGridIds());
 		if(null == list || list.size() < NumConstant.ZERO){
 			result.setVotableCountMap(votableCountMap);