Merge branch 'dev_data_stats' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev_data_stats

epmet-module/data-report/data-report-server/src/main/java/com/epmet/service/user/impl/UserAnalysisServiceImpl.java

@@ -90,14 +90,15 @@ public class UserAnalysisServiceImpl implements UserAnalysisService {
             //注册用户
             userSummaryInfoResultDTO=userAnalysisDao.selectRegUserSummaryInfo(myAgencyId);
         }
-        if(null!=userSummaryInfoResultDTO){
+        if (userSummaryInfoResultDTO == null){
+            return new UserSummaryInfoResultDTO();
+        }
             userSummaryInfoResultDTO.setCurrentDate(DateUtils.getxAxisDatePattern(userSummaryInfoResultDTO.getCurrentDate(),"."));
             //提取出工具类
             String partyMemberProStr=userSummaryInfoResultDTO.getPartymemberProportionValue().setScale(NumConstant.TWO, BigDecimal.ROUND_HALF_UP).stripTrailingZeros().toPlainString();
             userSummaryInfoResultDTO.setPartymemberProportion(partyMemberProStr.concat("%"));
             String warmProStr=userSummaryInfoResultDTO.getWarmHeartedProportionValue().setScale(NumConstant.TWO, BigDecimal.ROUND_HALF_UP).stripTrailingZeros().toPlainString();
             userSummaryInfoResultDTO.setWarmHeartedProportion(warmProStr.concat("%"));
-        }
         logger.info(String.format("查询用户汇总信息返参%s",JSON.toJSONString(userSummaryInfoResultDTO)));
        return userSummaryInfoResultDTO;
     }

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/impl/StatsGroupServiceImpl.java

@@ -148,12 +148,11 @@ public class StatsGroupServiceImpl implements StatsGroupService {
             String agencyId = agency.getId();
             agencyResult.setAgencyId(agencyId);
             agencyResult.setCustomerId(customerId);
+            agencyResult.setPid(agency.getPid());
             BeanUtils.copyProperties(timeDim,agencyResult);
             //机关下的所有网格（包括直属网格）
             List<String> allGrid = this.getAllGrid(agencyId,customerId);
             if (allGrid.size() != NumConstant.ZERO) {
-                String pidByAgencyId = dimAgencyService.getPidByAgencyId(agencyId);
-                agencyResult.setPid(StringUtils.isBlank(pidByAgencyId) ? "0" : pidByAgencyId);
                 // 1. 机关下有多少网格
                 List<GridIdListByCustomerResultDTO> customerGridIdList = customerGridService.getCustomerGridIdList(customerId, dateId);
                 AtomicReference<Integer> gridSize = new AtomicReference<>(0);

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

@@ -502,7 +502,7 @@ public class ResiGroupServiceImpl extends BaseServiceImpl<ResiGroupDao, ResiGrou
 		//5、给用户发送消息？？？待定
 		//6、新增小组缓存信息、组员缓存信息
 		Map<String, Object> param = new HashMap<>();
-		param.put(ModuleConstant.RESI_GROUP_ID_CAMEL, resiGroupDTO.getId());
+		param.put(ModuleConstant.RESI_GROUP_ID, resiGroupDTO.getId());
 		param.put(FieldConstant.DEL_FLAG,NumConstant.ZERO_STR);
 		List<ResiGroupStatisticalDTO> statisticalList = resiGroupStatisticalService.list(param);
 		if (null != statisticalList && statisticalList.size() > 0) {