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 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' - and u.register_time between #{startTime} and #{endTime} + and u.CREATED_TIME between #{startTime} and #{endTime} and u.state = #{state} and u.real_name like '%${realName}%' and u.NICKNAME like '%${nickname}%'