From 1070d34d3a7a7757eeb09460409ec39f40f8bb64 Mon Sep 17 00:00:00 2001
From: yinzuomei <yinzuomei@elink-cn.com>
Date: Tue, 26 Nov 2019 14:52:47 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B1=85=E6=B0=91=E8=AF=A6=E6=83=85=E6=8E=A5?=
 =?UTF-8?q?=E5=8F=A3=E5=8F=8D=E5=8F=82=E6=B7=BB=E5=8A=A0=E6=89=8B=E6=9C=BA?=
 =?UTF-8?q?=E5=8F=B7=E3=80=81=E8=AE=A4=E8=AF=81=E6=8F=92=E5=85=A5=E5=8E=86?=
 =?UTF-8?q?=E5=8F=B2=E8=AE=B0=E5=BD=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../dto/epdc/result/EpdcResidentDetailResultDTO.java   |  4 ++++
 .../elink/esua/epdc/service/impl/UserServiceImpl.java  | 10 +++++++++-
 .../src/main/resources/mapper/UserDao.xml              |  4 +++-
 3 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/epdc/result/EpdcResidentDetailResultDTO.java b/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/epdc/result/EpdcResidentDetailResultDTO.java
index ba396c433..43921ea2c 100644
--- a/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/epdc/result/EpdcResidentDetailResultDTO.java
+++ b/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/epdc/result/EpdcResidentDetailResultDTO.java
@@ -45,6 +45,10 @@ public class EpdcResidentDetailResultDTO implements Serializable {
 	 * 审核状态（1待认证 3已认证）
 	 */
 	private String state;
+	/**
+	 * 用户手机号
+	 */
+	private String mobile;
 	/**
 	 * 扫码网格列表
 	 */
diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/impl/UserServiceImpl.java b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/impl/UserServiceImpl.java
index 90d4ea86a..bc8b6dc8c 100644
--- a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/impl/UserServiceImpl.java
+++ b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/impl/UserServiceImpl.java
@@ -569,7 +569,15 @@ public class UserServiceImpl extends BaseServiceImpl<UserDao, UserEntity> implem
             } else {
                 throw new RenException("是否认证通过数据不匹配");
             }
-            this.update(userDTO);
+            //插入认证历史表
+            UserAuthenticateHistoryEntity authenticateHistoryEntity=new UserAuthenticateHistoryEntity();
+            authenticateHistoryEntity.setUserId(userDTO.getId());
+            authenticateHistoryEntity.setMobile(userDTO.getMobile());
+            authenticateHistoryEntity.setRealName(userDTO.getRealName());
+            authenticateHistoryEntity.setAddress(userDTO.getAddress());
+            authenticateHistoryEntity.setAuthenticatedFlag(formDTO.getAuthenticatedFlag());//是否认证通过 0未通过1通过
+            //authenticateHistoryEntity.setRemark(userDTO.getRemark());
+            userAuthenticateHistoryDao.insert(authenticateHistoryEntity);
         }
         return new Result();
     }
diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/resources/mapper/UserDao.xml b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/resources/mapper/UserDao.xml
index d6e69cf1b..6166be296 100644
--- a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/resources/mapper/UserDao.xml
+++ b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/resources/mapper/UserDao.xml
@@ -105,6 +105,7 @@
         <result column="DWELLING_PLACE" property="dwellingPlace"/>
         <result column="PARTY_FLAG" property="partyFlag"/>
         <result column="state" property="state"/>
+        <result column="mobile" property="mobile"/>
         <collection property="gridList" ofType="com.elink.esua.epdc.dto.epdc.result.EpdcResidentDetailGridResultDTO">
             <result column="completeName" property="completeName"/>
             <result column="leaderFlag" property="leaderFlag"/>
@@ -120,6 +121,7 @@
             eu.DWELLING_PLACE,
             eu.PARTY_FLAG ,
             eu.state,
+            eu.mobile,
             CONCAT_WS('-',eugr.STREET,eugr.COMMUNITY,eugr.GRID) as completeName,
             eugr.LEADER_FLAG as leaderFlag
         FROM
@@ -306,4 +308,4 @@
         AND ug_r.DEL_FLAG = '0'
         AND u.DEL_FLAG = '0'
     </select>
-</mapper>
\ No newline at end of file
+</mapper>