Merge remote-tracking branch 'origin/dev_renhu'

epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/HouseServiceImpl.java

@@ -927,6 +927,8 @@ public class HouseServiceImpl implements HouseService, ResultDataResolver {
             houseDTO.setOrgId(id);
             houseList.add(houseChart(houseDTO));
         }
+        //start 2022.11.17需求：http://zentao.elinkservice.cn/story-view-718.html
+        //原来饼图是：居民总数、常住人口数、流动人口数 后改为下面的人户状况饼图，后面如果所有客户都上线了，就把第2步的查询注释掉。
         //2.直属下级列表的居民数据
         UserChartFormDTO userDTO = new UserChartFormDTO();
         userDTO.setOrgType(orgType);
@@ -935,6 +937,8 @@ public class HouseServiceImpl implements HouseService, ResultDataResolver {
         if (!userResult.success()) {
             throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "获取居民人房统计数据失败" + userResult.getInternalMsg(), userResult.getMsg());
         }
+        //end
+        //3.居民总数、人户一致、人在户不在、户在人不在，没填写是暂不清楚
         RHZKStatisticsFormDTO rhzkStatisticsFormDTO = new RHZKStatisticsFormDTO();
         rhzkStatisticsFormDTO.setOrgIds(idList);
         rhzkStatisticsFormDTO.setOrgType(orgType);

epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/RHZKStatisticsFormDTO.java

@@ -15,13 +15,17 @@ public class RHZKStatisticsFormDTO implements Serializable {
 
     private String orgId;
 
-    private List<String> orgIds;
-
     /**
      * grid：网格；village：小区；
      */
     private String orgType;
 
+    /**
+     * /epmetuser/icresiuser/rhzkList调用会赋值
+     */
+    private List<String> orgIds;
+
+    //tokenDto中获取
     private String staffId;
     private String customerId;
 

epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/OwnerRelationResultDTO.java

@@ -27,7 +27,7 @@ public class OwnerRelationResultDTO implements Serializable {
         private String relation;
 
         /**
-         * 人户状况
+         * 2022.11.17：人户状况：人户一致、人在户不在、户在人不在、暂不清楚
          */
         private String renHuCondition;
     }

epmet-user/epmet-user-server/src/main/java/com/epmet/enums/RenHuConditionEnum.java

@@ -2,6 +2,9 @@ package com.epmet.enums;
 
 import org.apache.commons.lang3.StringUtils;
 
+/**
+ * 居民信息里的人户状况枚举类
+ */
 public enum RenHuConditionEnum {
 
     /**

epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserServiceImpl.java

@@ -1479,6 +1479,7 @@ public class IcResiUserServiceImpl extends BaseServiceImpl<IcResiUserDao, IcResi
                     if (RelationshipEnum.SELF.getCode().equals(item.getYhzgx())) {
                         result.setOwnerName(item.getName());
                     }
+                    //2022.11.17 返参增加人户状况名称
                     if (StringUtils.isBlank(item.getRhzk())){
                         bean.setRenHuCondition(RenHuConditionEnum.ZBQC.getName());
                     }else {