解决冲突---党员用户待审核列表

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

@@ -1,5 +1,6 @@
 package com.elink.esua.epdc.controller;
 
+import com.elink.esua.epdc.common.token.dto.TokenDto;
 import com.elink.esua.epdc.commons.tools.utils.Result;
 import com.elink.esua.epdc.dto.epdc.result.EpdcPartyMemberDetailDto;
 import com.elink.esua.epdc.dto.epdc.form.EpdcAppAuthenticateResidentFormDTO;
@@ -7,6 +8,15 @@ import com.elink.esua.epdc.dto.epdc.result.EpdcResidentDetailResultDTO;
 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 com.elink.esua.epdc.dto.epdc.form.EpdcWorkUserFromDTO;
+import com.elink.esua.epdc.dto.epdc.result.EpdcWorkUserResultDTO;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.List;
 
 /**
  * 工作端，用户登录，用户管理相关接口
@@ -23,6 +33,7 @@ public class ApiWorkUserController {
 
     /**
      * 获取居民详情（已认证或待认证（提交信息待审核）的居民用户）
+     *
      * @param userId 用户Id
      * @return
      */
@@ -33,6 +44,7 @@ public class ApiWorkUserController {
 
     /**
      * 获取党员详情（已认证或未认证的党员用户）
+     *
      * @param userId
      * @return
      */
@@ -43,6 +55,7 @@ public class ApiWorkUserController {
 
     /**
      * 认证用户（用户信息审核）
+     *
      * @param formDTO
      * @return
      */
@@ -50,4 +63,18 @@ public class ApiWorkUserController {
     public Result authenticateResident(@RequestBody EpdcAppAuthenticateResidentFormDTO formDTO) {
         return workUserService.authenticateResident(formDTO);
     }
+
+    /***
+     * 用户列表
+     * @param workUserFromDto
+     * @return com.elink.esua.epdc.commons.tools.utils.Result<java.util.List   <   com.elink.esua.epdc.dto.epdc.result.EpdcWorkUserResultDTO>>
+     * @author qushutong
+     * @date 2019/11/18 13:53
+     */
+    @GetMapping("list")
+    public Result<List<EpdcWorkUserResultDTO>> getUserList(@LoginUser TokenDto userDetail, EpdcWorkUserFromDTO
+            workUserFromDto) {
+
+        return workUserService.listWorkLlist(userDetail, workUserFromDto);
+    }
 }

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

@@ -7,6 +7,7 @@ import com.elink.esua.epdc.dto.UserGridRelationDTO;
 import com.elink.esua.epdc.dto.UserWxFormIdDTO;
 import com.elink.esua.epdc.dto.epdc.form.*;
 import com.elink.esua.epdc.dto.epdc.result.*;
+import com.elink.esua.epdc.dto.epdc.result.EpdcWorkUserResultDTO;
 import com.elink.esua.epdc.feign.fallback.UserFeignClientFallback;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.http.MediaType;
@@ -241,11 +242,10 @@ public interface UserFeignClient {
     Result<EpdcUserRegisterInfoResultDTO> registerOrBindGrid(EpdcUserRegisterBindGridFormDTO formDto);
 
     /**
-     *
      * 更新用户微信信息
      *
-     * @params [userDTO]
      * @return com.elink.esua.epdc.commons.tools.utils.Result
+     * @params [userDTO]
      * @author liuchuang
      * @since 2019/10/25 17:07
      */
@@ -275,4 +275,13 @@ public interface UserFeignClient {
      */
     @GetMapping("app-user/epdc-app/user/partyMemberDetail")
     Result<EpdcPartyMemberDetailDto> partyMemberDetail(String userId);
+    /***
+     * 用户列表
+     * @param workUserFromDto
+     * @return com.elink.esua.epdc.commons.tools.utils.Result<com.elink.esua.epdc.dto.epdc.result.EpdcWorkUserResultFTO>
+     * @author qushutong
+     * @date 2019/11/18 13:47
+     */
+    @GetMapping("app-user/epdc-app/user/list")
+    Result<List<EpdcWorkUserResultDTO>> getWorkUserList(EpdcWorkUserFromDTO workUserFromDto);
 }

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

@@ -135,4 +135,9 @@ public class UserFeignClientFallback implements UserFeignClient {
     public Result authenticateResident(EpdcAppAuthenticateResidentFormDTO formDTO) {
         return ModuleUtils.feignConError(ServiceConstant.EPDC_USER_SERVER, "authenticateResident", formDTO);
     }
+
+    @Override
+    public Result<List<EpdcWorkUserResultDTO>> getWorkUserList(EpdcWorkUserFromDTO workUserFromDto) {
+        return ModuleUtils.feignConError(ServiceConstant.EPDC_USER_SERVER, "getWorkUserList", workUserFromDto);
+    }
 }

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

@@ -4,6 +4,11 @@ import com.elink.esua.epdc.commons.tools.utils.Result;
 import com.elink.esua.epdc.dto.epdc.form.EpdcAppAuthenticateResidentFormDTO;
 import com.elink.esua.epdc.dto.epdc.result.EpdcResidentDetailResultDTO;
 import com.elink.esua.epdc.dto.epdc.result.EpdcPartyMemberDetailDto;
+import com.elink.esua.epdc.common.token.dto.TokenDto;
+import com.elink.esua.epdc.dto.epdc.form.EpdcWorkUserFromDTO;
+import com.elink.esua.epdc.dto.epdc.result.EpdcWorkUserResultDTO;
+
+import java.util.List;
 
 /**
  * 工作端，用户登录、用户管理 相关业务接口
@@ -31,4 +36,13 @@ public interface WorkUserService {
 	 * @return
 	 */
 	Result<EpdcPartyMemberDetailDto> partyMemberDetail(String userId);
+
+    /***
+     *  用户列表
+     * @param workUserFromDto
+     * @return java.util.List<com.elink.esua.epdc.dto.epdc.result.EpdcWorkUserResultFTO>
+     * @author qushutong
+     * @date 2019/11/18 13:39
+     */
+    Result<List<EpdcWorkUserResultDTO>> listWorkLlist(TokenDto userDetail, EpdcWorkUserFromDTO workUserFromDto);
 }

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

@@ -4,11 +4,16 @@ import com.elink.esua.epdc.commons.tools.utils.Result;
 import com.elink.esua.epdc.dto.epdc.form.EpdcAppAuthenticateResidentFormDTO;
 import com.elink.esua.epdc.dto.epdc.result.EpdcResidentDetailResultDTO;
 import com.elink.esua.epdc.dto.epdc.result.EpdcPartyMemberDetailDto;
+import com.elink.esua.epdc.common.token.dto.TokenDto;
+import com.elink.esua.epdc.dto.epdc.form.EpdcWorkUserFromDTO;
+import com.elink.esua.epdc.dto.epdc.result.EpdcWorkUserResultDTO;
 import com.elink.esua.epdc.feign.UserFeignClient;
 import com.elink.esua.epdc.service.WorkUserService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.util.List;
+
 /**
  * 工作端，用户登录、用户管理 相关业务实现
  *
@@ -22,6 +27,7 @@ public class WorkUserServiceImpl implements WorkUserService {
 
     /**
      * 获取居民详情（已认证或待认证（提交信息待审核）的居民用户）
+     *
      * @param userId 用户Id
      * @return
      */
@@ -32,6 +38,7 @@ public class WorkUserServiceImpl implements WorkUserService {
 
     /**
      * 认证用户（用户信息审核）
+     *
      * @param formDTO
      * @return
      */
@@ -42,6 +49,7 @@ public class WorkUserServiceImpl implements WorkUserService {
 
     /**
      * 获取党员详情（已认证或未认证的党员用户）
+     *
      * @param userId
      * @return
      */
@@ -49,4 +57,18 @@ public class WorkUserServiceImpl implements WorkUserService {
     public Result<EpdcPartyMemberDetailDto> partyMemberDetail(String userId) {
         return userFeignClient.partyMemberDetail(userId);
     }
+
+    /***
+     * 获取用户待审核列表
+     * @param userDetail
+     * @param workUserFromDto
+     * @return com.elink.esua.epdc.commons.tools.utils.Result<java.util.List<com.elink.esua.epdc.dto.epdc.result.EpdcWorkUserResultDTO>>
+     * @author qushutong
+     * @date 2019/11/19 10:00
+     */
+    @Override
+    public Result<List<EpdcWorkUserResultDTO>> listWorkLlist(TokenDto userDetail, EpdcWorkUserFromDTO workUserFromDto) {
+        workUserFromDto.setUserId(userDetail.getUserId());
+        return userFeignClient.getWorkUserList(workUserFromDto);
+    }
 }

esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/constant/UserFieldConsant.java

@@ -21,4 +21,5 @@ public interface UserFieldConsant {
     String USER_ID = "USER_ID";
     String SWITCHED_TIME = "SWITCHED_TIME";
     String STATE = "STATE";
+    String LEADER_FLAG = "LEADER_FLAG";
 }

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

@@ -0,0 +1,64 @@
+package com.elink.esua.epdc.dto.epdc.form;
+
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
+import java.io.Serializable;
+
+/**
+ * @author: qushutong
+ * @Date: 2019/11/18 13:38
+ * @Description: 用户列表入参
+ */
+@Data
+public class EpdcWorkUserFromDTO implements Serializable {
+    private static final long serialVersionUID = 4478942293796375973L;
+
+    /**
+     * authenticatedFlag : 是否已认证 0否 1是
+     * partyFlag : 0 是否党员，0否，1是
+     */
+
+    @NotBlank(message = "是否已认证不能为空")
+    private String authenticatedFlag;
+
+    @NotBlank(message = "是否党员不能为空")
+    private String partyFlag;
+
+    /**
+     * 用户id
+     */
+    @NotBlank(message = "用户ID不能为空")
+    private String userId;
+
+    /**
+     * 用户所属网格ID
+     */
+    @NotNull(message = "用户网格ID不能为空")
+    private Long deptId;
+
+    /**
+     * 页码
+     */
+    @NotNull(message = "页码不能为空")
+    private Integer pageIndex;
+
+    /**
+     * 页容量
+     */
+    @NotNull(message = "页容量不能为空")
+    private Integer pageSize;
+
+    /**
+     * 第一页查询发起时的时间
+     */
+    @NotBlank(message = "时间戳不能为空")
+    private String timestamp;
+
+    /**
+     * 是否查询用户管理的所有网格的数据 0否 1是
+     */
+    @NotBlank(message = "是否查询用户管理的所有网格的数据不能为空")
+    private String allGridFlag;
+}

esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/epdc/result/EpdcWorkUserResultDTO.java

@@ -0,0 +1,28 @@
+package com.elink.esua.epdc.dto.epdc.result;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+
+/**
+ *  @author: qushutong
+ *  @Date: 2019/11/18 13:34
+ *  @Description: 用户列表
+ */
+@Data
+public class EpdcWorkUserResultDTO implements Serializable {
+    private static final long serialVersionUID = 3286304561837276520L;
+    /**
+     * userId : 52531
+     * faceImg : pufkbhB1UA
+     * nickname : 259OeUCMwu
+     * registerTime : 1574037785289
+     */
+
+    private String userId;
+    private String faceImg;
+    private String nickname;
+    private String registerTime;
+
+}

esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/controller/EpdcAppUserController.java

@@ -12,6 +12,7 @@ import com.elink.esua.epdc.dto.epdc.result.EpdcUserRegisterInfoResultDTO;
 import com.elink.esua.epdc.dto.epdc.result.EpdcUserInfoResultDTO;
 import com.elink.esua.epdc.dto.epdc.result.EpdcUserRegisterAuditMsgResultDTO;
 import com.elink.esua.epdc.dto.epdc.result.EpdcUserGroupInviteResultDTO;
+import com.elink.esua.epdc.dto.epdc.result.EpdcWorkUserResultDTO;
 import com.elink.esua.epdc.service.UserService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
@@ -280,4 +281,15 @@ public class EpdcAppUserController {
 		public Result authenticateResident(@RequestBody EpdcAppAuthenticateResidentFormDTO formDTO){
 			return userService.authenticateResident(formDTO);
 		}
+    /***
+     * 用户列表
+     * @param workUserFromDto
+     * @return com.elink.esua.epdc.commons.tools.utils.Result<com.elink.esua.epdc.dto.epdc.result.EpdcWorkUserResultFTO>
+     * @author qushutong
+     * @date 2019/11/18 13:47
+     */
+    @GetMapping("list")
+    public Result<List<EpdcWorkUserResultDTO>> getWorkUserList(@RequestBody EpdcWorkUserFromDTO workUserFromDto){
+        return userService.getWorkUserList(workUserFromDto);
+    }
 }

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

@@ -25,6 +25,8 @@ import com.elink.esua.epdc.dto.epdc.result.EpdcResidentDetailResultDTO;
 import com.elink.esua.epdc.dto.epdc.result.EpdcUserInfoResultDTO;
 import com.elink.esua.epdc.dto.epdc.result.EpdcUserRegisterAuditMsgResultDTO;
 import com.elink.esua.epdc.dto.epdc.result.EpdcUserGroupInviteResultDTO;
+import com.elink.esua.epdc.dto.epdc.form.EpdcWorkUserFromDTO;
+import com.elink.esua.epdc.dto.epdc.result.EpdcWorkUserResultDTO;
 import com.elink.esua.epdc.entity.UserEntity;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
@@ -127,4 +129,13 @@ public interface UserDao extends BaseDao<UserEntity> {
      * @return
      */
      String getPartyMemberIdNoByUserID(@Param("userId")String userId);
+
+   /***
+    * 用户党员待审核列表
+    * @param workUserFromDto
+    * @return java.util.List<com.elink.esua.epdc.dto.epdc.result.EpdcWorkUserResultDTO>
+    * @author qushutong
+    * @date 2019/11/18 19:28
+    */
+    List<EpdcWorkUserResultDTO> selectWorkUserList(EpdcWorkUserFromDTO workUserFromDto);
 }

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

@@ -30,6 +30,7 @@ import com.elink.esua.epdc.dto.epdc.result.EpdcUserInfoResultDTO;
 import com.elink.esua.epdc.dto.epdc.result.EpdcUserRegisterAuditMsgResultDTO;
 import com.elink.esua.epdc.dto.epdc.result.EpdcUserGroupInviteResultDTO;
 import com.elink.esua.epdc.dto.epdc.result.*;
+import com.elink.esua.epdc.dto.epdc.result.EpdcWorkUserResultDTO;
 import com.elink.esua.epdc.entity.UserEntity;
 
 import java.util.List;
@@ -220,4 +221,12 @@ public interface UserService extends BaseService<UserEntity> {
      * @return
      */
     Result authenticateResident(EpdcAppAuthenticateResidentFormDTO formDTO);
+    /***
+     * 获取用户列表
+     * @param workUserFromDto
+     * @return com.elink.esua.epdc.commons.tools.utils.Result<java.util.List<com.elink.esua.epdc.dto.epdc.result.EpdcWorkUserResultDTO>>
+     * @author qushutong
+     * @date 2019/11/18 14:00
+     */
+    Result<List<EpdcWorkUserResultDTO>> getWorkUserList(EpdcWorkUserFromDTO workUserFromDto);
 }

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

@@ -22,6 +22,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.elink.esua.epdc.commons.mybatis.service.impl.BaseServiceImpl;
+import com.elink.esua.epdc.commons.tools.constant.Constant;
 import com.elink.esua.epdc.commons.tools.constant.FieldConstant;
 import com.elink.esua.epdc.commons.tools.constant.NumConstant;
 import com.elink.esua.epdc.commons.tools.enums.UserSexEnum;
@@ -45,6 +46,9 @@ import com.elink.esua.epdc.dto.epdc.form.*;
 import com.elink.esua.epdc.dto.epdc.result.EpdcResidentDetailResultDTO;
 import com.elink.esua.epdc.dto.epdc.result.EpdcUserRegisterInfoResultDTO;
 import com.elink.esua.epdc.entity.PartyAuthenticationFailedEntity;
+import com.elink.esua.epdc.dto.epdc.result.EpdcUserInfoResultDTO;
+import com.elink.esua.epdc.dto.epdc.result.EpdcUserRegisterAuditMsgResultDTO;
+import com.elink.esua.epdc.dto.epdc.result.EpdcWorkUserResultDTO;
 import com.elink.esua.epdc.entity.PartyMembersEntity;
 import com.elink.esua.epdc.entity.UserEntity;
 import com.elink.esua.epdc.entity.UserGridRelationEntity;
@@ -57,10 +61,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
-import java.util.Arrays;
+import java.util.*;
-import java.util.Date;
-import java.util.List;
-import java.util.Map;
 
 /**
  * 用户信息表
@@ -559,4 +560,22 @@ public class UserServiceImpl extends BaseServiceImpl<UserDao, UserEntity> implem
         }
         return new Result<EpdcPartyMemberDetailDto>().error("获取信息失败");
     }
+    @Override
+    public Result<List<EpdcWorkUserResultDTO>> getWorkUserList(EpdcWorkUserFromDTO workUserFromDto) {
+        int pageIndex = (workUserFromDto.getPageIndex() - NumConstant.ONE) * workUserFromDto.getPageSize();
+        workUserFromDto.setPageIndex(pageIndex);
+        String authenticatedFlag = workUserFromDto.getAuthenticatedFlag();
+        if (YesOrNoEnum.NO.value().equals(authenticatedFlag)) {
+            authenticatedFlag = NumConstant.ONE_STR;
+        } else if (YesOrNoEnum.YES.value().equals(authenticatedFlag)) {
+            authenticatedFlag = NumConstant.THREE_STR;
+        } else {
+            throw new RenException("数据不匹配");
+        }
+        workUserFromDto.setAuthenticatedFlag(authenticatedFlag);
+
+        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

@@ -70,6 +70,13 @@
         ADDRESS,
         STATE,
         PARTY_FLAG
+        u.id,
+        u.REAL_NAME,
+        u.MOBILE,
+        u.REGISTER_TIME,
+        IDENTITY_NO,
+        STATE,
+        PARTY_FLAG
         FROM
         epdc_user u
         LEFT JOIN epdc_user_grid_relation ug ON u.ID = ug.USER_ID
@@ -90,7 +97,8 @@
         u.register_time desc
     </select>
     <!--  根据userId获取居民详情（已认证或待认证（提交信息待审核）的居民用户）  -->
-    <resultMap id="EpdcResidentDetailResultDtoMap" type="com.elink.esua.epdc.dto.epdc.result.EpdcResidentDetailResultDTO">
+    <resultMap id="EpdcResidentDetailResultDtoMap"
+               type="com.elink.esua.epdc.dto.epdc.result.EpdcResidentDetailResultDTO">
         <id column="id" property="userId"/>
         <result column="REAL_NAME" property="realName"/>
         <result column="IDENTITY_NO" property="identityNo"/>
@@ -250,4 +258,28 @@
             AND eu.id = #{userId}
     </select>
 
+    <select id="selectWorkUserList" resultType="com.elink.esua.epdc.dto.epdc.result.EpdcWorkUserResultDTO">
+        SELECT
+        u.ID as userId,
+        u.NICKNAME as nickname,
+        u.REGISTER_TIME as registerTime,
+        u.FACE_IMG as faceImg
+        FROM
+        epdc_user_grid_relation ug_l
+        LEFT JOIN epdc_user_grid_relation ug_r ON ug_l.GRID_ID = ug_r.GRID_ID
+        LEFT JOIN epdc_user u ON ug_r.USER_ID = u.ID
+        WHERE
+        ug_l.USER_ID = #{userId}
+        AND ug_l.LEADER_FLAG = '1'
+        AND u.STATE = #{authenticatedFlag}
+        <if test='allGridFlag=="0"'>
+            AND ug_r.GRID_ID = #{deptId}
+        </if>
+        AND u.CREATED_TIME &lt;= STR_TO_DATE( #{timestamp}, '%Y-%m-%d %H:%i:%s' )
+        GROUP BY
+        u.ID
+        ORDER BY
+        u.CREATED_TIME DESC
+        LIMIT #{pageIndex},#{pageSize}
+    </select>
 </mapper>