【五大图层】居民信息接口新增"居民类别"列返回，是个字典

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;
     }

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<>();
+
     /**
      * 同屋的其他人
      */

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;
     }