修改业务端用户列表代码；修改业务端免登陆路由

esua-epdc/epdc-gateway/src/main/resources/application.yml

@@ -204,6 +204,7 @@ renren:
   workLoginUrls:
     - /api/work/user/getToken #工作端-获取token
     - /api/work/user/login #工作端-登录
+    - /api/work/*/swagger/**
   workUrls:
     - /api/work/** #工作端接口
 

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

@@ -1,6 +1,5 @@
 package com.elink.esua.epdc.controller;
 
-import com.elink.esua.epdc.common.token.dto.TokenDto;
 import com.elink.esua.epdc.common.token.dto.WorkUserAuthorizationDTO;
 import com.elink.esua.epdc.common.token.dto.WorkUserLoginDTO;
 import com.elink.esua.epdc.commons.tools.utils.Result;
@@ -11,7 +10,6 @@ import com.elink.esua.epdc.dto.form.EpdcWorkAppUserMaTokenFormDTO;
 import com.elink.esua.epdc.service.WorkUserService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
-import com.elink.esua.epdc.commons.tools.annotation.LoginUser;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -66,7 +64,7 @@ public class ApiWorkUserController {
      * @param formDto 用户Id
      * @return
      */
-    @GetMapping("residentDetail")
+    @GetMapping("swagger/residentDetail")
     public Result<EpdcResidentDetailResultDTO> residentDetail(EpdcResidentDetailFormDTO formDto) {
         ValidatorUtils.validateEntity(formDto);
         return workUserService.residentDetail(formDto);
@@ -78,7 +76,7 @@ public class ApiWorkUserController {
      * @param userId
      * @return
      */
-    @GetMapping("partyMemberDetail")
+    @GetMapping("swagger/partyMemberDetail")
     public Result<EpdcPartyMemberDetailDto> partyMemberDetail(String userId) {
         return workUserService.partyMemberDetail(userId);
     }
@@ -89,7 +87,7 @@ public class ApiWorkUserController {
      * @param formDTO
      * @return
      */
-    @PostMapping("authenticateResident")
+    @PostMapping("swagger/authenticateResident")
     public Result authenticateResident(@RequestBody EpdcAppAuthenticateResidentFormDTO formDTO) {
         ValidatorUtils.validateEntity(formDTO);
         return workUserService.authenticateResident(formDTO);
@@ -138,7 +136,7 @@ public class ApiWorkUserController {
      * @Description 用户认证审核历史
      * @Date 2019/11/22 13:16
      **/
-    @GetMapping("authenticateHistory")
+    @GetMapping("swagger/authenticateHistory")
     public Result<List<EpdcAuthenticateHistoryResultDTO>> authenticateHistory(EpdcAuthenticateHistoryFormDTO formDTO) {
         ValidatorUtils.validateEntity(formDTO);
         return workUserService.authenticateHistory(formDTO);
@@ -152,7 +150,7 @@ public class ApiWorkUserController {
      * @author work@yujt.net.cn
      * @date 2019/11/26 15:52
      */
-    @GetMapping("listGrid")
+    @GetMapping("swagger/listGrid")
     public Result<List<EpdcUserGridResultDTO>> listUserGrid(String userId) {
         return workUserService.listUserGrid(userId);
     }
@@ -164,7 +162,7 @@ public class ApiWorkUserController {
      * @Description 解除与网格的关联
      * @Date 2019/11/22 14:16
      **/
-    @PostMapping("removeGrid")
+    @PostMapping("swagger/removeGrid")
     public Result removeGrid(@RequestBody EpdcAppRemoveGridFormDTO formDto) {
         ValidatorUtils.validateEntity(formDto);
         return workUserService.removeGrid(formDto);

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

@@ -58,6 +58,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
+import javax.validation.constraints.NotBlank;
 import java.util.*;
 
 /**
@@ -111,10 +112,10 @@ public class UserServiceImpl extends BaseServiceImpl<UserDao, UserEntity> implem
     @Override
     public UserDTO get(String id) {
         UserEntity entity = baseDao.selectById(id);
-        UserDTO resultDTO=ConvertUtils.sourceToTarget(entity, UserDTO.class);
+        UserDTO resultDTO = ConvertUtils.sourceToTarget(entity, UserDTO.class);
-        resultDTO.setTotalSubmitNum(userAuthenticateHistoryDao.countAuthenticateHistory(id,null));
+        resultDTO.setTotalSubmitNum(userAuthenticateHistoryDao.countAuthenticateHistory(id, null));
-        resultDTO.setTotalFailNum(userAuthenticateHistoryDao.countAuthenticateHistory(id,NumConstant.ZERO_STR));//0 未通过1通过
+        resultDTO.setTotalFailNum(userAuthenticateHistoryDao.countAuthenticateHistory(id, NumConstant.ZERO_STR));//0 未通过1通过
-        resultDTO.setTotalPassSubmitNum(userAuthenticateHistoryDao.countAuthenticateHistory(id,NumConstant.ONE_STR));
+        resultDTO.setTotalPassSubmitNum(userAuthenticateHistoryDao.countAuthenticateHistory(id, NumConstant.ONE_STR));
         return resultDTO;
     }
 
@@ -157,16 +158,16 @@ public class UserServiceImpl extends BaseServiceImpl<UserDao, UserEntity> implem
             userTagRelationService.save(userTagRelationDTO);
         }*/
         //组装数据并插入用户认证历史表(epdc_user_authenticate_history)
-        UserEntity userEntity=this.baseDao.selectById(entity.getId());
+        UserEntity userEntity = this.baseDao.selectById(entity.getId());
-        UserAuthenticateHistoryEntity userAuthenticateHistoryEntity=new UserAuthenticateHistoryEntity();
+        UserAuthenticateHistoryEntity userAuthenticateHistoryEntity = new UserAuthenticateHistoryEntity();
         userAuthenticateHistoryEntity.setUserId(userEntity.getId());
         userAuthenticateHistoryEntity.setMobile(userEntity.getMobile());
         userAuthenticateHistoryEntity.setRealName(userEntity.getRealName());
         userAuthenticateHistoryEntity.setAddress(userEntity.getAddress());
         userAuthenticateHistoryEntity.setAuthenticatedFlag(userEntity.getState());//状态(0-已注册，1-已完善信息待审核，2-信息审核不通过，3-信息审核通过)
-        if(NumConstant.THREE_STR.equals(entity.getState())){
+        if (NumConstant.THREE_STR.equals(entity.getState())) {
             userAuthenticateHistoryEntity.setAuthenticatedFlag(YesOrNoEnum.YES.value());
-        }else{
+        } else {
             userAuthenticateHistoryEntity.setAuthenticatedFlag(YesOrNoEnum.NO.value());
         }
         userAuthenticateHistoryEntity.setRemark(dto.getRemark());
@@ -473,7 +474,7 @@ public class UserServiceImpl extends BaseServiceImpl<UserDao, UserEntity> implem
                     .eq(UserFieldConsant.REAL_NAME, userDto.getRealName());
             int selectCount = this.partyMembersDao.selectCount(partyWrapper);
             //用户认证历史
-            UserAuthenticateHistoryEntity userAuthenticateHistoryEntity=new UserAuthenticateHistoryEntity();
+            UserAuthenticateHistoryEntity userAuthenticateHistoryEntity = new UserAuthenticateHistoryEntity();
             if (selectCount == NumConstant.ZERO) {
                 // 党员库中没有，存进党员认证失败表
                 PartyAuthenticationFailedEntity authenticationFailedEntity = ConvertUtils.sourceToTarget(partyMembersEntity, PartyAuthenticationFailedEntity.class);
@@ -552,6 +553,7 @@ public class UserServiceImpl extends BaseServiceImpl<UserDao, UserEntity> implem
 
     /**
      * 认证用户（用户信息审核）
+     *
      * @param formDTO
      * @return
      */
@@ -570,7 +572,7 @@ public class UserServiceImpl extends BaseServiceImpl<UserDao, UserEntity> implem
                 throw new RenException("是否认证通过数据不匹配");
             }
             //插入认证历史表
-            UserAuthenticateHistoryEntity authenticateHistoryEntity=new UserAuthenticateHistoryEntity();
+            UserAuthenticateHistoryEntity authenticateHistoryEntity = new UserAuthenticateHistoryEntity();
             authenticateHistoryEntity.setUserId(userDTO.getId());
             authenticateHistoryEntity.setMobile(userDTO.getMobile());
             authenticateHistoryEntity.setRealName(userDTO.getRealName());
@@ -584,34 +586,51 @@ public class UserServiceImpl extends BaseServiceImpl<UserDao, UserEntity> implem
 
     /**
      * 获取党员详情（已认证或未认证的党员用户）
+     *
      * @param userId
      * @return
      */
     @Override
     public Result<EpdcPartyMemberDetailDto> partyMemberDetail(String userId) {
-        if(StringUtils.isBlank(userId)){
+        if (StringUtils.isBlank(userId)) {
             return new Result<EpdcPartyMemberDetailDto>().error("用户Id不能为空");
         }
         String idNo = baseDao.getPartyMemberIdNoByUserID(userId);
-        if(StringUtils.isBlank(idNo)){
+        if (StringUtils.isBlank(idNo)) {
             return new Result<EpdcPartyMemberDetailDto>().error("用户不是党员或身份证号为空");
         }
         EpdcPartyMemberDetailDto dto = baseDao.partyMemberDetailByUserId(userId);
-        if(dto == null){
+        if (dto == null) {
             dto = baseDao.partyMemberDetailFaild(userId);
         }
-        if(dto != null){
+        if (dto != null) {
             return new Result().ok(dto);
         }
         return new Result<EpdcPartyMemberDetailDto>().error("获取信息失败");
     }
+
     @Override
     public Result<List<EpdcWorkUserResultDTO>> getWorkUserList(EpdcWorkUserFromDTO workUserFromDto) {
         int pageIndex = (workUserFromDto.getPageIndex() - NumConstant.ONE) * workUserFromDto.getPageSize();
         workUserFromDto.setPageIndex(pageIndex);
 
-        List<EpdcWorkUserResultDTO> epdcWorkUserResultDTOS = baseDao.selectWorkUserList(workUserFromDto);
+        String partyFlag = workUserFromDto.getPartyFlag();
+        String authenticatedFlag = workUserFromDto.getAuthenticatedFlag();
 
+
+        // 查询认证成的居民或党员
+        String state = AppUserStatesEnum.STATE_INFORMATION_PASSED.value();
+        // 查询待认证的居民
+        if (YesOrNoEnum.NO.value().equals(partyFlag) && YesOrNoEnum.NO.equals(authenticatedFlag)) {
+            state = AppUserStatesEnum.STATE_COMPLETED_INFORMATION_PENDING_REVIEW.value();
+        }
+        // 查询认证失败的党员
+        if (YesOrNoEnum.YES.value().equals(partyFlag) && YesOrNoEnum.NO.equals(authenticatedFlag)) {
+            state = AppUserStatesEnum.STATE_INFORMATION_NOT_PASSED.value();
+        }
+        workUserFromDto.setAuthenticatedFlag(state);
+
+        List<EpdcWorkUserResultDTO> epdcWorkUserResultDTOS = baseDao.selectWorkUserList(workUserFromDto);
         return new Result<List<EpdcWorkUserResultDTO>>().ok(epdcWorkUserResultDTOS);
     }
 

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

@@ -271,14 +271,9 @@
             LEFT JOIN epdc_user u ON ug.USER_ID = u.ID
         WHERE
             u.PART_FLAG = #{partyFlag}
+            AND u.STATE = #{authenticatedFlag}
             AND u.DEL_FLAG = '0'
             AND ug.DEL_FLAG = '0'
-            <choose>
-                <when test='authenticatedFlag != null authenticatedFlag == "0"'>
-                    and u.STATE = '1'
-                </when>
-                <otherwise>and u.STATE = '3'</otherwise>
-            </choose>
             <choose>
                 <when test="gridId != null">AND ug.GRID_ID = #{gridId}</when>
                 <otherwise>