Browse Source

Merge remote-tracking branch 'origin/hotfix/workClient_bug'

# Conflicts:
#	esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/resources/mapper/PartyAuthenticationFailedDao.xml
#	esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/resources/mapper/UserDao.xml
feature/dangjian
李鹏飞 5 years ago
parent
commit
0385c51cc4
  1. 13
      esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/controller/SysUserController.java
  2. 9
      esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/dao/SysUserDao.java
  3. 9
      esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/service/SysUserService.java
  4. 5
      esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/service/impl/SysUserServiceImpl.java
  5. 6
      esua-epdc/epdc-admin/epdc-admin-server/src/main/resources/mapper/SysUserDao.xml
  6. 13
      esua-epdc/epdc-auth/src/main/java/com/elink/esua/epdc/controller/AuthController.java
  7. 10
      esua-epdc/epdc-auth/src/main/java/com/elink/esua/epdc/feign/UserFeignClient.java
  8. 5
      esua-epdc/epdc-auth/src/main/java/com/elink/esua/epdc/feign/fallback/UserFeignClientFallback.java
  9. 9
      esua-epdc/epdc-auth/src/main/java/com/elink/esua/epdc/service/AuthService.java
  10. 10
      esua-epdc/epdc-auth/src/main/java/com/elink/esua/epdc/service/impl/AuthServiceImpl.java
  11. 17
      esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiAnalysisUserController.java
  12. 10
      esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/ResourceFeignClient.java
  13. 5
      esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/fallback/ResourceFeignClientFallback.java
  14. 8
      esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/AnalysisUserService.java
  15. 4
      esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/AnalysisUserServiceImpl.java
  16. 4
      esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/issue/service/impl/IssueServiceImpl.java
  17. 5
      esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/epdc/form/EpdcWorkUserFromDTO.java
  18. 29
      esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/dao/UserDao.java
  19. 23
      esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/impl/UserServiceImpl.java
  20. 2
      esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/resources/mapper/PartyAuthenticationFailedDao.xml
  21. 171
      esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/resources/mapper/UserDao.xml

13
esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/controller/SysUserController.java

@ -488,6 +488,19 @@ public class SysUserController {
return new Result();
}
/**
* @describe: 数据端-用户退出
* @author wangtong
* @date 2020/6/18 16:36
* @param userId
* @return com.elink.esua.epdc.commons.tools.utils.Result
*/
@GetMapping("updateAnalysisUserOpenId/{userId}")
public Result updateAnalysisUserOpenId(@PathVariable("userId") Long userId) {
sysUserService.updateUserAnalysisOpenId(userId);
return new Result();
}
/**
* @Description: 根据部门id查询部门下的所有用户手机号
* @Param: [deptId]

9
esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/dao/SysUserDao.java

@ -107,6 +107,15 @@ public interface SysUserDao extends BaseDao<SysUserEntity> {
*/
void updateUserOpenId(@Param("userId") Long userId);
/**
* @describe: 数据端-用户退出
* @author wangtong
* @date 2020/6/18 16:38
* @param [userId]
* @return void
*/
void updateUserAnalysisOpenId(@Param("userId") Long userId);
/**
* @Description: 根据部门id查询部门下的所有用户手机号
* @Param: [map]

9
esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/service/SysUserService.java

@ -122,6 +122,15 @@ public interface SysUserService extends BaseService<SysUserEntity> {
*/
void updateUserOpenId(Long userId);
/**
* @describe: 数据端-用户退出
* @author wangtong
* @date 2020/6/18 16:37
* @param userId
* @return void
*/
void updateUserAnalysisOpenId(Long userId);
/**
* @Description: 根据部门id查询部门下的所有用户手机号
* @Param: [deptId]

5
esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/service/impl/SysUserServiceImpl.java

@ -283,6 +283,11 @@ public class SysUserServiceImpl extends BaseServiceImpl<SysUserDao, SysUserEntit
baseDao.updateUserOpenId(userId);
}
@Override
public void updateUserAnalysisOpenId(Long userId) {
baseDao.updateUserAnalysisOpenId(userId);
}
@Override
public Result<List<String>> getUserPhoneByListDeptId(List<Long> deptId) {
Map<String,Object> map = new HashMap<>();

6
esua-epdc/epdc-admin/epdc-admin-server/src/main/resources/mapper/SysUserDao.xml

@ -135,7 +135,11 @@
</update>
<update id="updateUserOpenId">
UPDATE sys_user SET open_id = '' WHERE id = #{userId} AND del_flag = 0
UPDATE sys_user SET work_open_id = '' WHERE id = #{userId} AND del_flag = 0
</update>
<update id="updateUserAnalysisOpenId">
UPDATE sys_user SET analysis_open_id = '' WHERE id = #{userId} AND del_flag = 0
</update>
<!-- 根据部门id,查询部门下的所有用户手机号 -->

13
esua-epdc/epdc-auth/src/main/java/com/elink/esua/epdc/controller/AuthController.java

@ -213,4 +213,17 @@ public class AuthController {
return authService.logoutUser(Long.parseLong(userId));
}
/**
* @describe: 数据端-用户退出
* @author wangtong
* @date 2020/6/18 16:34
* @param userId
* @return com.elink.esua.epdc.commons.tools.utils.Result
*/
@GetMapping("logoutAnalysisUser/{userId}")
public Result logoutAnalysisUser(@PathVariable("userId") String userId) {
return authService.logoutAnalysisUser(Long.parseLong(userId));
}
}

10
esua-epdc/epdc-auth/src/main/java/com/elink/esua/epdc/feign/UserFeignClient.java

@ -99,5 +99,13 @@ public interface UserFeignClient {
@GetMapping("sys/user/updateUserOpenId/{userId}")
Result updateUserOpenId(@PathVariable("userId") Long userId);
/**
* @describe: 数据端-用户退出
* @author wangtong
* @date 2020/6/18 16:35
* @param [userId]
* @return com.elink.esua.epdc.commons.tools.utils.Result
*/
@GetMapping("sys/user/updateAnalysisUserOpenId/{userId}")
Result updateAnalysisUserOpenId(@PathVariable("userId") Long userId);
}

5
esua-epdc/epdc-auth/src/main/java/com/elink/esua/epdc/feign/fallback/UserFeignClientFallback.java

@ -61,4 +61,9 @@ public class UserFeignClientFallback implements UserFeignClient {
public Result updateUserOpenId(Long userId) {
return new Result<>();
}
@Override
public Result updateAnalysisUserOpenId(Long userId) {
return new Result<>();
}
}

9
esua-epdc/epdc-auth/src/main/java/com/elink/esua/epdc/service/AuthService.java

@ -92,5 +92,12 @@ public interface AuthService {
*/
Result logoutUser(Long userId);
/**
* @describe: 数据端-用户退出
* @author wangtong
* @date 2020/6/18 16:34
* @param [parseLong]
* @return com.elink.esua.epdc.commons.tools.utils.Result
*/
Result logoutAnalysisUser(Long userId);
}

10
esua-epdc/epdc-auth/src/main/java/com/elink/esua/epdc/service/impl/AuthServiceImpl.java

@ -368,12 +368,20 @@ public class AuthServiceImpl implements AuthService {
// 清空redis
String key = RedisKeys.getSecurityUserKey(userId);
redisUtils.hSet(key, "kill", UserKillEnum.YES.value());
// 更新open_id
userFeignClient.updateUserOpenId(userId);
return new Result();
}
@Override
public Result logoutAnalysisUser(Long userId) {
// 清空redis
String key = RedisKeys.getSecurityUserKey(userId);
redisUtils.hSet(key, "kill", UserKillEnum.YES.value());
// 更新open_id
userFeignClient.updateAnalysisUserOpenId(userId);
return new Result();
}
}

17
esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiAnalysisUserController.java

@ -4,6 +4,8 @@ import com.elink.esua.epdc.common.token.dto.AnalysisUserAuthorizationDTO;
import com.elink.esua.epdc.common.token.dto.AnalysisUserLoginDTO;
import com.elink.esua.epdc.common.token.dto.TokenDto;
import com.elink.esua.epdc.commons.tools.annotation.LoginUser;
import com.elink.esua.epdc.commons.tools.security.user.SecurityUser;
import com.elink.esua.epdc.commons.tools.security.user.UserDetail;
import com.elink.esua.epdc.commons.tools.utils.Result;
import com.elink.esua.epdc.commons.tools.validator.ValidatorUtils;
import com.elink.esua.epdc.dto.form.EpdcWorkAppUserMaTokenFormDTO;
@ -112,4 +114,19 @@ public class ApiAnalysisUserController {
public Result<List<UserSortRankResultDTO>> userRegisterSort(UserSortRankFormDTO formDto) {
return analysisUserService.userRegisterSort(formDto);
}
/**
* @describe: 数据端-用户退出
* @author wangtong
* @date 2020/6/18 16:30
* @param
* @return com.elink.esua.epdc.commons.tools.utils.Result
*/
@PostMapping("logout")
public Result logout() {
UserDetail user = SecurityUser.getUser();
Long userId = user.getId();
return analysisUserService.logout(userId);
}
}

10
esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/ResourceFeignClient.java

@ -73,4 +73,14 @@ public interface ResourceFeignClient {
*/
@GetMapping("auth/logoutUser/{userId}")
Result logoutUser(@PathVariable("userId") String userId);
/**
* @describe: 数据端-用户退出
* @author wangtong
* @date 2020/6/18 16:32
* @param [s]
* @return com.elink.esua.epdc.commons.tools.utils.Result
*/
@GetMapping("auth/logoutAnalysisUser/{userId}")
Result logoutAnalysisUser(@PathVariable("userId") String userId);
}

5
esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/fallback/ResourceFeignClientFallback.java

@ -41,4 +41,9 @@ public class ResourceFeignClientFallback implements ResourceFeignClient {
public Result logoutUser(String userId) {
return ModuleUtils.feignConError(ServiceConstant.EPDC_AUTH_SERVER, "logoutUser", userId);
}
@Override
public Result logoutAnalysisUser(String userId) {
return ModuleUtils.feignConError(ServiceConstant.EPDC_AUTH_SERVER, "logoutAnalysisUser", userId);
}
}

8
esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/AnalysisUserService.java

@ -97,4 +97,12 @@ public interface AnalysisUserService {
**/
Result<List<UserSortRankResultDTO>> userRegisterSort(UserSortRankFormDTO formDto);
/**
* @describe: 数据端-用户退出
* @author wangtong
* @date 2020/6/18 16:31
* @param [userId]
* @return com.elink.esua.epdc.commons.tools.utils.Result
*/
Result logout(Long userId);
}

4
esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/AnalysisUserServiceImpl.java

@ -96,6 +96,10 @@ public class AnalysisUserServiceImpl implements AnalysisUserService {
return analysisUserFeignClient.userRegisterSort(formDto);
}
@Override
public Result logout(Long userId) {
return resourceFeignClient.logoutAnalysisUser(userId+"");
}
@Override

4
esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/issue/service/impl/IssueServiceImpl.java

@ -25,7 +25,6 @@ import com.elink.esua.epdc.commons.tools.constant.NumConstant;
import com.elink.esua.epdc.commons.tools.exception.RenException;
import com.elink.esua.epdc.commons.tools.page.PageData;
import com.elink.esua.epdc.commons.tools.security.user.SecurityUser;
import com.elink.esua.epdc.commons.tools.security.user.UserDetail;
import com.elink.esua.epdc.commons.tools.utils.ConvertUtils;
import com.elink.esua.epdc.commons.tools.utils.DateUtils;
import com.elink.esua.epdc.commons.tools.utils.Result;
@ -256,11 +255,12 @@ public class IssueServiceImpl extends BaseServiceImpl<IssueDao, IssueEntity> imp
itemDeptEntity.setDeptId(dto.getHandlerDeptId());
itemDeptEntity.setCreatedDeptId(dto.getHandlerDeptId());
itemDeptEntity.setItemId(itemEntity.getId());
itemDeptEntity.setDeptName(dto.getHandlerDept());
itemDeptService.insert(itemDeptEntity);
informationFormDTO.setBusinessId(itemEntity.getId());
// 事件来源-友邻社群
// 事件来源-友邻社群.
if (StringUtils.isNotEmpty(entity.getGroupId())) {
// 更新话题状态
Map<String, String> map = new HashMap<>();

5
esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/epdc/form/EpdcWorkUserFromDTO.java

@ -54,4 +54,9 @@ public class EpdcWorkUserFromDTO implements Serializable {
private List<Long> gridIdList;
/**
* 0是待认证居民1已认证党员
*/
private String selectFlag;
}

29
esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/dao/UserDao.java

@ -270,5 +270,34 @@ public interface UserDao extends BaseDao<UserEntity> {
*/
List<UserDTO> selectFaildAuthenticatedListUserDto(Map<String, Object> params);
/**
*
* 待认证居民APP & 已认证党员
*
* @params [params]
* @return java.util.List
* @author wanggongfeng
* @since 2020/6/8 10:26
*/
List<EpdcWorkUserResultDTO> selectAppUserDto(EpdcWorkUserFromDTO epdcWorkUserFromDTO);
/***
* 已认证居民APP
* @params [params]
* @return java.util.List
* @author wanggongfeng
* @date 2020/6/8 11:18
*/
List<EpdcWorkUserResultDTO> selectAppAuthenticatedListUserDtoByList(EpdcWorkUserFromDTO epdcWorkUserFromDTO);
/***
* 党员认证失败APP
* @params [params]
* @return java.util.List
* @author wanggongfeng
* @date 2020/6/8 14:18
*/
List<EpdcWorkUserResultDTO> selectAppPartyAuthenticationFailedList(EpdcWorkUserFromDTO epdcWorkUserFromDTO);
}

23
esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/impl/UserServiceImpl.java

@ -1073,8 +1073,26 @@ public class UserServiceImpl extends BaseServiceImpl<UserDao, UserEntity> implem
String partyFlag = workUserFromDto.getPartyFlag();
String authenticatedFlag = workUserFromDto.getAuthenticatedFlag();
// 修改于2020-06-08:目的是与 PC 端数据保持一致
List<EpdcWorkUserResultDTO> epdcWorkUserResultDTOS = new ArrayList<EpdcWorkUserResultDTO>();
if (YesOrNoEnum.NO.value().equals(partyFlag) && YesOrNoEnum.NO.value().equals(authenticatedFlag)) {
// 待认证居民
workUserFromDto.setSelectFlag(NumConstant.ZERO_STR);
epdcWorkUserResultDTOS = baseDao.selectAppUserDto(workUserFromDto);
} else if (YesOrNoEnum.NO.value().equals(partyFlag) && YesOrNoEnum.YES.value().equals(authenticatedFlag)){
// 已认证居民
epdcWorkUserResultDTOS = baseDao.selectAppAuthenticatedListUserDtoByList(workUserFromDto);
} else if (YesOrNoEnum.YES.value().equals(partyFlag) && YesOrNoEnum.YES.value().equals(authenticatedFlag)){
// 已认证党员
workUserFromDto.setSelectFlag(NumConstant.ONE_STR);
epdcWorkUserResultDTOS = baseDao.selectAppUserDto(workUserFromDto);
} else {
// 党员认证失败
epdcWorkUserResultDTOS = baseDao.selectAppPartyAuthenticationFailedList(workUserFromDto);
}
return new Result<List<EpdcWorkUserResultDTO>>().ok(epdcWorkUserResultDTOS);
// 查询认证成的居民或党员
/*// 查询认证成的居民或党员
String state = AppUserStatesEnum.STATE_INFORMATION_PASSED.value();
// 查询待认证的居民
if (YesOrNoEnum.NO.value().equals(partyFlag) && YesOrNoEnum.NO.value().equals(authenticatedFlag)) {
@ -1089,9 +1107,8 @@ public class UserServiceImpl extends BaseServiceImpl<UserDao, UserEntity> implem
return new Result<List<EpdcWorkUserResultDTO>>().ok(epdcWorkUserResultDTOS);
}
workUserFromDto.setAuthenticatedFlag(state);
List<EpdcWorkUserResultDTO> epdcWorkUserResultDTOS = baseDao.selectWorkUserList(workUserFromDto);
return new Result<List<EpdcWorkUserResultDTO>>().ok(epdcWorkUserResultDTOS);
return new Result<List<EpdcWorkUserResultDTO>>().ok(epdcWorkUserResultDTOS);*/
}
@Override

2
esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/resources/mapper/PartyAuthenticationFailedDao.xml

@ -50,6 +50,8 @@
<if test="identityNo != '' and identityNo != null"> and epaf.IDENTITY_NO like '%${identityNo}%'</if>
<if test="realName != '' and realName != null"> and epaf.real_name like '%${realName}%'</if>
<if test="mobile != '' and mobile != null"> and epaf.mobile like '%${mobile}%'</if>
GROUP BY epaf.USER_ID
HAVING epaf.CREATED_TIME = MAX(epaf.CREATED_TIME)
ORDER BY
epaf.CREATED_TIME desc
</select>

171
esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/resources/mapper/UserDao.xml

@ -850,7 +850,11 @@
CREATED_TIME,
id
LIMIT 1
)) AS DEPT_ID
)) AS DEPT_ID,
ifnull(
IF( u.ALL_DEPT_IDS = '', NULL, u.ALL_DEPT_IDS ),
( SELECT ALL_DEPT_IDS FROM epdc_user_grid_relation WHERE DEL_FLAG = '0' AND USER_ID = u.ID ORDER BY CREATED_TIME, id LIMIT 1 )
) AS ALL_DEPT_IDS
FROM
epdc_user u
where u.DEL_FLAG = '0'
@ -1292,4 +1296,169 @@
ORDER BY user.register_time desc
</select>
<!--待认证居民(selectFlag=0) & 已认证党员(selectFlag=1)小程序接口-->
<select id="selectAppUserDto" parameterType="com.elink.esua.epdc.dto.epdc.form.EpdcWorkUserFromDTO" resultType="com.elink.esua.epdc.dto.epdc.result.EpdcWorkUserResultDTO">
SELECT
user.ID as userId,
user.NICKNAME as nickname,
user.REGISTER_TIME as registerTime,
user.FACE_IMG as faceImg
FROM (
SELECT
DISTINCT
u.ID,
u.REAL_NAME,
u.NICKNAME,
u.MOBILE,
u.REGISTER_TIME,
u.CREATED_TIME,
u.UPDATED_TIME,
u.IDENTITY_NO,
u.ADDRESS,
u.STATE,
u.PARTY_FLAG,
u.ALL_DEPT_NAMES,
u.FACE_IMG,
u.PARENT_DEPT_IDS,
u.ALL_DEPT_IDS,
(
SELECT AUTHENTICATED_TYPE
FROM epdc_user_authenticate_history
WHERE DEL_FLAG = '0' AND AUTHENTICATED_TYPE IN ( '0', '1' ) AND USER_ID = u.ID ORDER BY CREATED_TIME DESC, id LIMIT 1
) AS AUTHENTICATED_TYPE,
(
SELECT AUTHENTICATED_FLAG
FROM epdc_user_authenticate_history
WHERE DEL_FLAG = '0' AND AUTHENTICATED_TYPE IN ( '0', '1' ) AND USER_ID = u.ID ORDER BY CREATED_TIME DESC , id LIMIT 1
) AS AUTHENTICATED_FLAG
FROM
epdc_user u
where u.DEL_FLAG = '0'
<choose>
<when test="gridId != null and gridId > 0">AND u.DEPT_ID = #{gridId}</when>
<otherwise>
<if test="gridIdList!=null and gridIdList.size()>0">
AND u.DEPT_ID in
<foreach collection="gridIdList" item="item" open="(" separator="," close=")">
#{item}
</foreach>
</if>
</otherwise>
</choose>
) user
where
<choose>
<when test="selectFlag != null and selectFlag != 0">
user.AUTHENTICATED_TYPE = '1' and user.AUTHENTICATED_FLAG = '1'
</when>
<otherwise>
user.AUTHENTICATED_TYPE = '0' AND user.AUTHENTICATED_FLAG = '2'
</otherwise>
</choose>
ORDER BY user.CREATED_TIME DESC
LIMIT #{pageIndex},#{pageSize}
</select>
<!--已认证居民小程序接口-->
<select id="selectAppAuthenticatedListUserDtoByList" parameterType="com.elink.esua.epdc.dto.epdc.form.EpdcWorkUserFromDTO" resultType="com.elink.esua.epdc.dto.epdc.result.EpdcWorkUserResultDTO">
SELECT
user.ID as userId,
user.NICKNAME as nickname,
user.REGISTER_TIME as registerTime,
user.FACE_IMG as faceImg
FROM
(
SELECT DISTINCT
u.ID,
u.REAL_NAME,
u.NICKNAME,
u.MOBILE,
u.REGISTER_TIME,
u.CREATED_TIME,
u.UPDATED_TIME,
u.IDENTITY_NO,
u.ADDRESS,
u.STATE,
u.PARTY_FLAG,
u.ALL_DEPT_NAMES,
u.FACE_IMG,
u.PARENT_DEPT_IDS,
u.ALL_DEPT_IDS,
(
SELECT
AUTHENTICATED_TYPE
FROM epdc_user_authenticate_history
WHERE
DEL_FLAG = '0' AND AUTHENTICATED_TYPE IN ( '0', '1' ) AND USER_ID = u.ID ORDER BY CREATED_TIME DESC, id LIMIT 1
) AS AUTHENTICATED_TYPE,
(
SELECT
AUTHENTICATED_FLAG
FROM epdc_user_authenticate_history
WHERE
DEL_FLAG = '0' AND AUTHENTICATED_TYPE IN ( '0', '1' ) AND USER_ID = u.ID ORDER BY CREATED_TIME DESC, id LIMIT 1
) AS AUTHENTICATED_FLAG,
(
SELECT
count( id ) AS HistoryCount
FROM epdc_user_authenticate_history
WHERE DEL_FLAG = '0' AND AUTHENTICATED_TYPE IN ( '0', '1' ) AND AUTHENTICATED_FLAG = '1' AND USER_ID = u.ID
) AS HistoryCount
FROM
epdc_user u
WHERE
u.DEL_FLAG = '0'
<choose>
<when test="gridId != null and gridId > 0">AND u.DEPT_ID = #{gridId}</when>
<otherwise>
<if test="gridIdList!=null and gridIdList.size()>0">
AND u.DEPT_ID in
<foreach collection="gridIdList" item="item" open="(" separator="," close=")">
#{item}
</foreach>
</if>
</otherwise>
</choose>
) USER
WHERE
( ( USER.AUTHENTICATED_TYPE = '0' AND USER.AUTHENTICATED_FLAG = '1' ) OR ( USER.AUTHENTICATED_TYPE = '1' AND USER.AUTHENTICATED_FLAG = '0' AND USER.HistoryCount > 0 ) )
ORDER BY
USER.CREATED_TIME DESC
LIMIT #{pageIndex},#{pageSize}
</select>
<!--党员认证失败小程序接口-->
<select id="selectAppPartyAuthenticationFailedList" parameterType="com.elink.esua.epdc.dto.epdc.form.EpdcWorkUserFromDTO" resultType="com.elink.esua.epdc.dto.epdc.result.EpdcWorkUserResultDTO">
select
ep.REGIST_TIME as registerTime,
uu.ID as userId,
uu.NICKNAME as nickname,
uu.FACE_IMG as faceImg
from
(SELECT
epaf.REGIST_TIME,
epaf.CREATED_TIME,
epaf.USER_ID,
epaf.GRID_ID
FROM epdc_party_authentication_failed epaf
WHERE epaf.del_flag = '0'
<choose>
<when test="gridId != null and gridId > 0">AND epaf.GRID_ID = #{gridId}</when>
<otherwise>
<if test="gridIdList!=null and gridIdList.size()>0">
AND epaf.GRID_ID in
<foreach collection="gridIdList" item="item" open="(" separator="," close=")">
#{item}
</foreach>
</if>
</otherwise>
</choose>
GROUP BY epaf.USER_ID HAVING epaf.CREATED_TIME = MAX(epaf.CREATED_TIME) ORDER BY epaf.CREATED_TIME desc
) ep
left join epdc_user uu on uu.ID = ep.USER_ID
where uu.DEL_FLAG = '0'
ORDER BY ep.CREATED_TIME DESC
LIMIT #{pageIndex},#{pageSize}
</select>
</mapper>

Loading…
Cancel
Save