diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/dao/UserDao.java b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/dao/UserDao.java index c7cabf455..f16a1eeec 100644 --- a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/dao/UserDao.java +++ b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/dao/UserDao.java @@ -148,5 +148,12 @@ public interface UserDao extends BaseDao { */ int selectCountUnauthorizedAmount(EpdcUnauthorizedAmountFromDTO fromDto); - + /** + * @param workUserFromDto + * @return java.util.List + * @Author yinzuomei + * @Description 获取用户列表:党员认证失败 + * @Date 2019/12/7 11:23 + **/ + List selectPartyAuthenticationFailedList(EpdcWorkUserFromDTO workUserFromDto); } 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 143d14c10..da08aef69 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 @@ -90,6 +90,8 @@ public class UserServiceImpl extends BaseServiceImpl implem private UserDetailRedis userDetailRedis; @Autowired private AdminFeignClient adminFeignClient; + @Autowired + private PartyAuthenticationFailedDao partyAuthenticationFailedDao; @Override public PageData page(Map params) { this.verifyParams(params); @@ -488,9 +490,6 @@ public class UserServiceImpl extends BaseServiceImpl implem return new Result().ok(userEntity.getState()); } - @Autowired - private PartyAuthenticationFailedDao partyAuthenticationFailedDao; - @Override @Transactional(rollbackFor = Exception.class) public Result completeUserInfo(EpdcAppUserCompleteInfoFormDTO formDto) { @@ -535,6 +534,7 @@ public class UserServiceImpl extends BaseServiceImpl implem partyAuthenticationFailedDao.insert(authenticationFailedEntity); userDto.setState(AppUserStatesEnum.STATE_INFORMATION_NOT_PASSED.value()); + userDto.setPartyFlag(YesOrNoEnum.NO.value());//是否是党员(0-否,1-是) 认证失败:0 userAuthenticateHistoryEntity.setAuthenticatedFlag(YesOrNoEnum.NO.value()); } else { UpdateWrapper partyUpdate = new UpdateWrapper<>(); @@ -543,6 +543,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 } //插入用户认证历史表 userAuthenticateHistoryEntity.setUserId(userId); @@ -662,6 +663,8 @@ public class UserServiceImpl extends BaseServiceImpl implem @Override public Result> getWorkUserList(EpdcWorkUserFromDTO workUserFromDto) { +// authenticatedFlag是否已认证 0否 1是 +// partyFlag 是否党员,0否,1是 int pageIndex = (workUserFromDto.getPageIndex() - NumConstant.ONE) * workUserFromDto.getPageSize(); workUserFromDto.setPageIndex(pageIndex); @@ -678,6 +681,10 @@ public class UserServiceImpl extends BaseServiceImpl implem // 查询认证失败的党员 if (YesOrNoEnum.YES.value().equals(partyFlag) && YesOrNoEnum.NO.value().equals(authenticatedFlag)) { state = AppUserStatesEnum.STATE_INFORMATION_NOT_PASSED.value(); + workUserFromDto.setAuthenticatedFlag(state); + workUserFromDto.setPartyFlag(YesOrNoEnum.NO.value()); + List epdcWorkUserResultDTOS = baseDao.selectPartyAuthenticationFailedList(workUserFromDto); + return new Result>().ok(epdcWorkUserResultDTOS); } workUserFromDto.setAuthenticatedFlag(state); 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 38fb20451..0bd225d9e 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 @@ -317,5 +317,39 @@ + +