From e816f0fcb38be8d54ca37edf5897e1d3edb0634c Mon Sep 17 00:00:00 2001
From: wangxianzhang <wangxianzhang@test.com>
Date: Mon, 1 Aug 2022 17:39:26 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=90=E4=BA=94=E5=A4=A7=E5=9B=BE=E5=B1=82?=
 =?UTF-8?q?=E3=80=91=E5=B1=85=E6=B0=91=E4=BF=A1=E6=81=AF=E6=8E=A5=E5=8F=A3?=
 =?UTF-8?q?=E6=96=B0=E5=A2=9E"=E5=B1=85=E6=B0=91=E7=B1=BB=E5=88=AB"?=
 =?UTF-8?q?=E5=88=97=E8=BF=94=E5=9B=9E=EF=BC=8C=E6=98=AF=E4=B8=AA=E5=AD=97?=
 =?UTF-8?q?=E5=85=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../commons/tools/enums/ResiCategoryEnum.java    | 14 ++++++++++++++
 .../com/epmet/dto/result/IcResiUserBriefDTO.java |  5 +++++
 .../service/impl/IcResiUserServiceImpl.java      | 16 ++++++++++++++++
 3 files changed, 35 insertions(+)

diff --git a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/enums/ResiCategoryEnum.java b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/enums/ResiCategoryEnum.java
index b7ab6cbddc..6416582380 100644
--- a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/enums/ResiCategoryEnum.java
+++ b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/enums/ResiCategoryEnum.java
@@ -28,6 +28,20 @@ public enum ResiCategoryEnum {
         this.label = label;
     }
 
+    /**
+     * 取枚举对象
+     * @param columnName
+     * @return
+     */
+    public static ResiCategoryEnum getEnum(String columnName) {
+        for (ResiCategoryEnum enumObject : ResiCategoryEnum.values()) {
+            if (enumObject.getColName().equals(columnName)) {
+                return enumObject;
+            }
+        }
+        return null;
+    }
+
     public String getColName() {
         return colName;
     }
diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/IcResiUserBriefDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/IcResiUserBriefDTO.java
index c9a0160aed..12121a4245 100644
--- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/IcResiUserBriefDTO.java
+++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/IcResiUserBriefDTO.java
@@ -71,6 +71,11 @@ public class IcResiUserBriefDTO extends HouseUserDTO implements Serializable {
      */
     private Map<String, String> volunteerCategories = new HashMap<>();
 
+    /**
+     * 居民类别
+     */
+    private Map<String, String> resiCategories = new HashMap<>();
+
     /**
      * 同屋的其他人
      */
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 07aeab3f53..cf76bb0f2b 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
@@ -1508,6 +1508,22 @@ public class IcResiUserServiceImpl extends BaseServiceImpl<IcResiUserDao, IcResi
             }
         }
 
+        // 3.居民类别填充
+        List<String> resiCategoryColumns = Arrays.stream(ResiCategoryEnum.values()).map(c -> c.getColName()).collect(Collectors.toList());
+
+        Map<String, String> resiCategories = new HashMap<>();
+
+        Map<String, String> categories = icResiUserDao.getCategoryListMap(resiCategoryColumns, resiUserId);
+        categories.forEach((k, v) -> {
+            if (NumConstant.ONE_STR.equals(v)) {
+                ResiCategoryEnum enumObject = ResiCategoryEnum.getEnum(k);
+                resiCategories.put(k, enumObject.getLabel());
+            }
+        });
+
+
+        r.setResiCategories(resiCategories);
+
         return r;
     }