居民详情接口反参添加手机号、认证插入历史记录

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;
 	/**
 	 * 扫码网格列表
 	 */

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

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