From d5f77e748bdce0b2c49ca574c72cc253b7b1f973 Mon Sep 17 00:00:00 2001
From: yinzuomei <576302893@qq.com>
Date: Thu, 11 May 2023 14:06:51 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B1=85=E6=B0=91=E4=BF=A1=E6=81=AF=E5=88=97?=
 =?UTF-8?q?=E8=A1=A8=EF=BC=8C=E5=B1=95=E7=A4=BA=E8=AF=81=E4=BB=B6=E7=B1=BB?=
 =?UTF-8?q?=E5=9E=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../commons/tools/enums/DictTypeEnum.java      |  3 ++-
 .../service/impl/IcResiUserServiceImpl.java    | 18 +++++++++++-------
 2 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/enums/DictTypeEnum.java b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/enums/DictTypeEnum.java
index 3790d9e9ba..fe487d3631 100644
--- a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/enums/DictTypeEnum.java
+++ b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/enums/DictTypeEnum.java
@@ -36,7 +36,8 @@ public enum DictTypeEnum {
     TRIP_DATA_TYPE("trip_data_type", "行程记录类型", 39),
     YT_KEY_POINT_USER_TYPE("yt_key_point_user_type","重点人群",40),
     YT_POPULATION_TYPE("yt_population_type","人口类型",41),
-    YT_POLITICS_STATUS("yt_politics_status","政治面貌",42)
+    YT_POLITICS_STATUS("yt_politics_status","政治面貌",42),
+    YT_ID_CARD_TYPE("yt_id_card_type","证件类型",43),
     ;
 
     private final String code;
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 fa69d45d32..e860f4e38e 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
@@ -1085,6 +1085,7 @@ public class IcResiUserServiceImpl extends BaseServiceImpl<IcResiUserDao, IcResi
         Result<Map<String, String>> keyPointUserTypeMapRes = epmetAdminOpenFeignClient.dictMap(DictTypeEnum.YT_KEY_POINT_USER_TYPE.getCode());
         Result<Map<String, String>> populationTypeMapRes = epmetAdminOpenFeignClient.dictMap(DictTypeEnum.YT_POPULATION_TYPE.getCode());
         Result<Map<String, String>> politicsStatusMapRes = epmetAdminOpenFeignClient.dictMap(DictTypeEnum.YT_POLITICS_STATUS.getCode());
+        Result<Map<String, String>> idCardTypeMapRes = epmetAdminOpenFeignClient.dictMap(DictTypeEnum.YT_ID_CARD_TYPE.getCode());
         for (Map<String, Object> resultMap : list) {
             String gridIdValue = null != resultMap.get(UserConstant.GRID_ID) ? resultMap.get(UserConstant.GRID_ID).toString() : StrConstant.EPMETY_STR;
             resultMap.put("GRID_ID_VALUE", gridIdValue);
@@ -1136,18 +1137,21 @@ public class IcResiUserServiceImpl extends BaseServiceImpl<IcResiUserDao, IcResi
             }
             // 烟台需求：列表又又又又增加了：重点人群、国籍、人口类型、政治面貌，其中 重点人群+人口类型+政治面貌需要特殊赋值
             if (resultMap.containsKey("KEY_POINT_USER_TYPE")) {
-                String keyPointUserType = (String) resultMap.get("KEY_POINT_USER_TYPE");
-                resultMap.put("KEY_POINT_USER_TYPE", keyPointUserTypeMapRes.getData().get(keyPointUserType));
+                String keyPointUserTypeValue = (String) resultMap.get("KEY_POINT_USER_TYPE");
+                resultMap.put("KEY_POINT_USER_TYPE", keyPointUserTypeMapRes.getData().get(keyPointUserTypeValue));
             }
             if (resultMap.containsKey("POPULATION_TYPE")) {
-                String populationType = (String) resultMap.get("POPULATION_TYPE");
-                resultMap.put("POPULATION_TYPE", populationTypeMapRes.getData().get(populationType));
+                String populationTypeValue = (String) resultMap.get("POPULATION_TYPE");
+                resultMap.put("POPULATION_TYPE", populationTypeMapRes.getData().get(populationTypeValue));
             }
             if (resultMap.containsKey("POLITICS_STATUS")) {
-                String politicsStatus = (String) resultMap.get("POLITICS_STATUS");
-                resultMap.put("POLITICS_STATUS", politicsStatusMapRes.getData().get(politicsStatus));
+                String politicsStatusValue = (String) resultMap.get("POLITICS_STATUS");
+                resultMap.put("POLITICS_STATUS", politicsStatusMapRes.getData().get(politicsStatusValue));
+            }
+            if (resultMap.containsKey("ID_CARD_TYPE")) {
+                String idCardTypeValue = (String) resultMap.get("ID_CARD_TYPE");
+                resultMap.put("ID_CARD_TYPE", idCardTypeMapRes.getData().get(idCardTypeValue));
             }
-
         }
     }