From f30e11175152933484b74bc8a0919a01baf1c1c2 Mon Sep 17 00:00:00 2001
From: yinzuomei <576302893@qq.com>
Date: Mon, 6 Dec 2021 20:48:12 +0800
Subject: [PATCH] =?UTF-8?q?api/resi/mine/mine/profile=E8=BF=94=E5=8F=82?=
 =?UTF-8?q?=E5=A2=9E=E5=8A=A0completeIdNum=EF=BC=9Atrue:=E5=B7=B2=E5=AE=8C?=
 =?UTF-8?q?=E5=96=84=E8=BA=AB=E4=BB=BD=E8=AF=81=E5=8F=B7=EF=BC=9Bfalse?=
 =?UTF-8?q?=EF=BC=9A=E6=9C=AA=E5=AE=8C=E5=96=84=E8=BA=AB=E4=BB=BD=E8=AF=81?=
 =?UTF-8?q?=E5=8F=B7=E3=80=82=20=E5=8F=AA=E6=9C=89registerFlag=3Dtrue&&com?=
 =?UTF-8?q?pleteIdNum=3Dfalse=E6=97=B6=E6=89=8D=E6=8F=90=E9=86=92=E7=94=A8?=
 =?UTF-8?q?=E6=88=B7=E5=AE=8C=E5=96=84=E4=BF=A1=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/epmet/dto/result/MyResiUserInfoResultDTO.java    | 4 ++++
 .../main/java/com/epmet/dto/result/MyselfMsgResultDTO.java    | 4 ++++
 .../src/main/java/com/epmet/service/impl/UserServiceImpl.java | 2 ++
 .../epmet-user-server/src/main/resources/mapper/UserDao.xml   | 3 ++-
 4 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/MyResiUserInfoResultDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/MyResiUserInfoResultDTO.java
index 5b26ee9150..a81e542024 100644
--- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/MyResiUserInfoResultDTO.java
+++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/MyResiUserInfoResultDTO.java
@@ -22,6 +22,10 @@ public class MyResiUserInfoResultDTO implements Serializable {
      * 是否已注册居民，true ,false
      * */
     private Boolean registerFlag;
+    /**
+     * 是否录入身份证号，true ,false
+     * */
+    private Boolean completeIdNum;
     /**
      * 微信昵称，可为空“”
      * */
diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/MyselfMsgResultDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/MyselfMsgResultDTO.java
index b46c665dfc..cb15d9440b 100644
--- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/MyselfMsgResultDTO.java
+++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/MyselfMsgResultDTO.java
@@ -38,4 +38,8 @@ public class MyselfMsgResultDTO implements Serializable {
      * */
     private String gridId;
 
+    /**
+     * 身份证号
+     * */
+    private String idNum;
 }
diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserServiceImpl.java
index 6c56b705a8..fee82e7839 100644
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserServiceImpl.java
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserServiceImpl.java
@@ -183,6 +183,8 @@ public class UserServiceImpl extends BaseServiceImpl<UserDao, UserEntity> implem
             MyResiUserInfoResultDTO result = ConvertUtils.sourceToTarget(myselfMsg,MyResiUserInfoResultDTO.class);
             //registerFlag 是否已注册居民，true ,false
             result.setRegisterFlag(StringUtils.isNotBlank(myselfMsg.getResiId()));
+            // 已录入身份证号：true;未完善：false.
+            result.setCompleteIdNum(StringUtils.isNotBlank(myselfMsg.getIdNum()));
             result.setRegisterGridName(ModuleConstant.EMPTY_STR);
             if(StringUtils.isNotBlank(myselfMsg.getGridId())){
                 //registerGridName 当前在哪个网格，显示哪个网格的名称
diff --git a/epmet-user/epmet-user-server/src/main/resources/mapper/UserDao.xml b/epmet-user/epmet-user-server/src/main/resources/mapper/UserDao.xml
index bbdaf024ba..6d82e4c200 100644
--- a/epmet-user/epmet-user-server/src/main/resources/mapper/UserDao.xml
+++ b/epmet-user/epmet-user-server/src/main/resources/mapper/UserDao.xml
@@ -34,7 +34,8 @@
             IFNULL(wechat.NICKNAME,"") AS nickName,
             IFNULL(resi.ID,"") AS resiId,
             IFNULL(CONCAT(resi.SURNAME,resi.NAME),"") AS userRealName,
-            IFNULL(relation.GRID_ID,"") AS gridId
+            IFNULL(relation.GRID_ID,"") AS gridId,
+            IFNULL(resi.id_num,'')AS idNum
             FROM
             USER user
             LEFT JOIN