From e8e4112f36653bdc9ab22c6cc60265a2118118db Mon Sep 17 00:00:00 2001
From: zxc <1272811460@qq.com>
Date: Wed, 16 Nov 2022 14:54:39 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BA=BA=E6=88=B7=E7=8A=B6=E5=86=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../epmet/service/impl/HouseServiceImpl.java  | 22 +++++++++-------
 .../com/epmet/dto/form/UserChartFormDTO.java  |  5 ++++
 .../service/impl/IcResiUserServiceImpl.java   |  1 +
 .../main/resources/mapper/IcResiUserDao.xml   | 26 +++++++++++++++++--
 4 files changed, 42 insertions(+), 12 deletions(-)

diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/HouseServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/HouseServiceImpl.java
index cc07bd0323..36c85a879a 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/HouseServiceImpl.java
+++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/HouseServiceImpl.java
@@ -972,16 +972,18 @@ public class HouseServiceImpl implements HouseService, ResultDataResolver {
                 }
             }
             for (RHZKStatisticsResultDTO r : rhzkResult.getData()) {
-                if (r.getOrgId().equals(id)){
-                    dto.setRhyzUserTotal(r.getRhyzUserTotal());
-                    dto.setRhyzUserRatio(r.getRhyzUserRatio());
-                    dto.setRzhbzUserTotal(r.getRzhbzUserTotal());
-                    dto.setRzhbzUserRatio(r.getRzhbzUserRatio());
-                    dto.setHzrzUserTotal(r.getHzrzUserTotal());
-                    dto.setHzrzUserRatio(r.getHzrzUserRatio());
-                    dto.setZbqcUserTotal(r.getZbqcUserTotal());
-                    dto.setZbqcUserRatio(r.getZbqcUserRatio());
-                    dto.setUserTotal(r.getUserTotal());
+                if (StringUtils.isNotBlank(r.getOrgId())){
+                    if (r.getOrgId().equals(id)){
+                        dto.setRhyzUserTotal(r.getRhyzUserTotal());
+                        dto.setRhyzUserRatio(r.getRhyzUserRatio());
+                        dto.setRzhbzUserTotal(r.getRzhbzUserTotal());
+                        dto.setRzhbzUserRatio(r.getRzhbzUserRatio());
+                        dto.setHzrzUserTotal(r.getHzrzUserTotal());
+                        dto.setHzrzUserRatio(r.getHzrzUserRatio());
+                        dto.setZbqcUserTotal(r.getZbqcUserTotal());
+                        dto.setZbqcUserRatio(r.getZbqcUserRatio());
+                        dto.setUserTotal(r.getUserTotal());
+                    }
                 }
             }
             list.add(dto);
diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/UserChartFormDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/UserChartFormDTO.java
index 7d357089f6..b0b0db77d2 100644
--- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/UserChartFormDTO.java
+++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/UserChartFormDTO.java
@@ -27,6 +27,11 @@ public class UserChartFormDTO implements Serializable {
      */
     private String type;
 
+    /**
+     * 人户一致:rhyz；人在户不在：rzhbz；户在人不在：hzrbz；暂不清楚：no；全部：all
+     */
+    private String rhType;
+
     private Integer pageNo = 1;
     private Integer pageSize = 20;
     private Boolean isPage = true;
diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserServiceImpl.java
index cda0e3ecc8..c87e96b12c 100644
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserServiceImpl.java
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserServiceImpl.java
@@ -3660,6 +3660,7 @@ public class IcResiUserServiceImpl extends BaseServiceImpl<IcResiUserDao, IcResi
         }
         r.setUserTotal(userByRenHu.stream().collect(Collectors.summingInt(RHZKStatisticsResultDTO::getTotal)));
         userByRenHu.forEach(u -> {
+            r.setOrgId(u.getOrgId());
             switch (u.getRhzk()){
                 case UserConstant.R_H_Y_Z:
                     r.setRhyzUserTotal(u.getTotal());
diff --git a/epmet-user/epmet-user-server/src/main/resources/mapper/IcResiUserDao.xml b/epmet-user/epmet-user-server/src/main/resources/mapper/IcResiUserDao.xml
index 37abe1f808..e2ea4571d3 100644
--- a/epmet-user/epmet-user-server/src/main/resources/mapper/IcResiUserDao.xml
+++ b/epmet-user/epmet-user-server/src/main/resources/mapper/IcResiUserDao.xml
@@ -1359,6 +1359,18 @@
         <if test='null != type and type.trim() != "" and type == "ld" '>
             AND (is_floating != '0' or is_floating is null)
         </if>
+        <if test='null != rhType and rhType.trim() != "" and rhType == "rhyz" '>
+            AND RHZK = 'rhyz'
+        </if>
+        <if test='null != rhType and rhType.trim() != "" and rhType == "rzhbz" '>
+            AND RHZK = 'rzhbz'
+        </if>
+        <if test='null != rhType and rhType.trim() != "" and rhType == "hzrbz" '>
+            AND RHZK = 'hzrbz'
+        </if>
+        <if test='null != rhType and rhType.trim() != "" and rhType == "no" '>
+            AND(RHZK = '' or RHZK = null)
+        </if>
         <choose>
             <when test='orgType == "agency"'>
                 AND (agency_id = #{orgId} OR pids LIKE CONCAT('%', #{orgId}, '%'))
@@ -1406,11 +1418,21 @@
     <select id="getUserByRenHu" resultType="com.epmet.dto.result.RHZKStatisticsResultDTO">
         SELECT
             COUNT(ID) AS total,
-            rhzk
+            rhzk,
+            orgId
         FROM
             (SELECT
              ID,
-             IFNULL(RHZK,'') AS rhzk
+             IFNULL(RHZK,'') AS rhzk,
+            <if test='orgType == "agency" '>
+                AGENCY_ID AS orgId
+            </if>
+            <if test='orgType == "grid" '>
+                GRID_ID AS orgId
+            </if>
+            <if test='orgType == "village" '>
+                VILLAGE_ID AS orgId
+            </if>
             FROM ic_resi_user
             WHERE DEL_FLAG = '0'
             AND `STATUS` = '0'