From d1c84b3b4ef86edd96555ca6485d94a85ac4ae87 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9B=B2=E6=A0=91=E9=80=9A?= <1976590620@qq.com>
Date: Tue, 24 Dec 2019 09:50:43 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=85=9A=E5=91=98=20?=
 =?UTF-8?q?=E7=94=A8=E6=88=B7=20=E8=AE=A4=E8=AF=81=E6=97=B6=E9=97=B4=20?=
 =?UTF-8?q?=E6=B3=A8=E5=86=8C=E6=97=B6=E9=97=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/com/elink/esua/epdc/dto/UserDTO.java        | 4 ++--
 .../com/elink/esua/epdc/service/impl/UserServiceImpl.java     | 1 +
 .../epdc-user-server/src/main/resources/mapper/UserDao.xml    | 3 ++-
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/UserDTO.java b/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/UserDTO.java
index ce34d84da..076cc8f66 100644
--- a/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/UserDTO.java
+++ b/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/UserDTO.java
@@ -56,7 +56,7 @@ public class UserDTO implements Serializable {
     private String password;
 
     /**
-     * 注册时间
+     * 认证时间
      */
     private Date registerTime;
 
@@ -272,7 +272,7 @@ public class UserDTO implements Serializable {
     private String createdBy;
 
     /**
-     * 创建时间
+     * 注册时间
      */
     private Date createdTime;
 
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 b83165c32..a29e9edfa 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
@@ -553,6 +553,7 @@ public class UserServiceImpl extends BaseServiceImpl<UserDao, UserEntity> implem
                 this.partyMembersDao.update(partyMembersEntity, partyUpdate);
                 userAuthenticateHistoryEntity.setAuthenticatedFlag(YesOrNoEnum.YES.value());
                 userDto.setPartyFlag(YesOrNoEnum.YES.value());//是否是党员(0-否，1-是)  认证失败：0
+                userDto.setRegisterTime(new Date());// 认证成功之后更新认证时间
             }
             //插入用户认证历史表
             userAuthenticateHistoryEntity.setUserId(userId);
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 c5ce6a420..3518487ac 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
@@ -65,6 +65,7 @@
         u.NICKNAME,
         u.MOBILE,
         u.REGISTER_TIME,
+        u.CREATED_TIME,
         IDENTITY_NO,
         ADDRESS,
         STATE,
@@ -75,7 +76,7 @@
         LEFT JOIN epdc_user_grid_relation ug ON u.ID = ug.USER_ID
         where
         u.del_flag = '0'
-        <if test="startTime != '' and endTime != ''">and u.register_time between #{startTime} and #{endTime}</if>
+        <if test="startTime != '' and endTime != ''">and u.CREATED_TIME between #{startTime} and #{endTime}</if>
         <if test="state != '' and state != null">and u.state = #{state}</if>
         <if test="realName != '' and realName != null">and u.real_name like '%${realName}%'</if>
         <if test="nickname != '' and nickname != null">and u.NICKNAME like '%${nickname}%'</if>