From c175749e149d20c5c9f91a61e458011dc60b40ef Mon Sep 17 00:00:00 2001
From: HAHA <HAHA@etoak.com>
Date: Fri, 29 Apr 2022 10:02:17 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=8C=E6=88=90=E5=85=9A=E5=91=98=E4=BA=AE?=
 =?UTF-8?q?=E6=97=97=E5=BE=85=E5=AE=A1=E6=A0=B8-=E5=88=86=E9=A1=B5?=
 =?UTF-8?q?=E5=88=97=E8=A1=A8=EF=BC=8C=E4=BA=AE=E6=97=97=E5=85=9A=E5=91=98?=
 =?UTF-8?q?-=E5=88=86=E9=A1=B5=E5=88=97=E8=A1=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../epdc/user/dto/UserStandaeBearerPage.java  | 66 +++++++++++++++++++
 .../epdc/user/controller/UserController.java  | 37 ++++++++---
 .../com/elink/esua/epdc/user/dao/UserDao.java | 55 ++++++++++++----
 .../esua/epdc/user/service/UserService.java   | 21 ++++++
 .../user/service/impl/UserServiceImpl.java    | 20 ++++++
 .../src/main/resources/mapper/UserDao.xml     | 64 ++++++++++++++++++
 6 files changed, 242 insertions(+), 21 deletions(-)
 create mode 100644 esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/user/dto/UserStandaeBearerPage.java

diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/user/dto/UserStandaeBearerPage.java b/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/user/dto/UserStandaeBearerPage.java
new file mode 100644
index 000000000..23c9610ca
--- /dev/null
+++ b/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/user/dto/UserStandaeBearerPage.java
@@ -0,0 +1,66 @@
+package com.elink.esua.epdc.user.dto;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+@Data
+public class UserStandaeBearerPage implements Serializable {
+
+    private static final long serialVersionUID = 2981162727662552113L;
+
+    /**
+     * 真实姓名
+     */
+    private String realName;
+
+    /**
+     * 手机号
+     */
+    private String mobile;
+
+    /**
+     * 全部部门名称
+     */
+    private String allDeptNames;
+
+    /**
+     * 身份证
+     */
+    private String identityNo;
+
+    /**
+     *地址
+     */
+    private String address;
+
+    /**
+     * 创建时间
+     */
+    private String createdTime;
+
+    /**
+     * 用户id
+     */
+    private String userId;
+
+    /**
+     * 机构id
+     */
+    private String gridId;
+
+    /**
+     * 审核备注
+     */
+    private String remark;
+
+    /**
+     * 申请id
+     */
+    private String id;
+
+    /**
+     * 申请状态
+     */
+    private String examineFlag;
+}
diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/user/controller/UserController.java b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/user/controller/UserController.java
index b1e6ca924..29583325f 100644
--- a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/user/controller/UserController.java
+++ b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/user/controller/UserController.java
@@ -18,6 +18,7 @@
 package com.elink.esua.epdc.user.controller;
 
 import com.elink.esua.epdc.commons.mybatis.annotation.DataFilter;
+import com.elink.esua.epdc.commons.tools.annotation.LoginUser;
 import com.elink.esua.epdc.commons.tools.page.PageData;
 import com.elink.esua.epdc.commons.tools.utils.ExcelUtils;
 import com.elink.esua.epdc.commons.tools.utils.Result;
@@ -28,6 +29,7 @@ import com.elink.esua.epdc.commons.tools.validator.group.DefaultGroup;
 import com.elink.esua.epdc.commons.tools.validator.group.UpdateGroup;
 import com.elink.esua.epdc.user.dto.PartyMemberModifyFormDTO;
 import com.elink.esua.epdc.user.dto.UserDTO;
+import com.elink.esua.epdc.user.dto.UserStandaeBearerPage;
 import com.elink.esua.epdc.user.dto.epdc.form.EpdcUserPointsFormDTO;
 import com.elink.esua.epdc.user.enums.AppUserStatesEnum;
 import com.elink.esua.epdc.user.excel.UserExcel;
@@ -63,11 +65,10 @@ public class UserController {
     }
 
     /**
-     *
      * 待认证党员列表
      *
+     * @return com.elink.esua.epdc.commons.tools.utils.Result<com.elink.esua.epdc.commons.tools.page.PageData < UserDTO>>
      * @params [params]
-     * @return com.elink.esua.epdc.commons.tools.utils.Result<com.elink.esua.epdc.commons.tools.page.PageData<UserDTO>>
      * @author liuchuang
      * @since 2020/3/24 15:47
      */
@@ -122,11 +123,10 @@ public class UserController {
     }
 
     /**
-     *
      * 党员认证
      *
-     * @params [dto]
      * @return com.elink.esua.epdc.commons.tools.utils.Result
+     * @params [dto]
      * @author liuchuang
      * @since 2020/3/24 15:58
      */
@@ -138,11 +138,10 @@ public class UserController {
     }
 
     /**
-     *
      * 党员认证通过并更新党员库信息
      *
-     * @params [dto]
      * @return com.elink.esua.epdc.commons.tools.utils.Result
+     * @params [dto]
      * @author liuchuang
      * @since 2020/3/24 19:38
      */
@@ -157,11 +156,10 @@ public class UserController {
     }
 
     /**
-     *
      * 新增党员信息并认证通过
      *
-     * @params [dto]
      * @return com.elink.esua.epdc.commons.tools.utils.Result
+     * @params [dto]
      * @author liuchuang
      * @since 2020/3/25 14:31
      */
@@ -202,11 +200,10 @@ public class UserController {
     }
 
     /**
-     *
      * 待认证党员导出
      *
-     * @params [params, response]
      * @return void
+     * @params [params, response]
      * @author liuchuang
      * @since 2020/3/24 16:00
      */
@@ -283,4 +280,24 @@ public class UserController {
         PageData<UserDTO> page = userService.authenticatedpage(params);
         return new Result<PageData<UserDTO>>().ok(page);
     }
+
+    /**
+     * 党员亮旗待审核-分页列表
+     *
+     * @param params
+     * @return com.elink.esua.epdc.commons.tools.utils.Result<com.elink.esua.epdc.commons.tools.page.PageData < com.elink.esua.epdc.user.dto.UserStandaeBearerPage>>
+     * @author LZN
+     * @date 2022/4/29 9:29
+     */
+    @GetMapping("/partymembers/standardbearer/examine/page")
+    public Result<PageData<UserStandaeBearerPage>> partyMenFlagReviewPage(@RequestParam Map<String, Object> params) {
+        PageData<UserStandaeBearerPage> page = userService.partyMenFlagReviewPage(params);
+        return new Result<PageData<UserStandaeBearerPage>>().ok(page);
+    }
+
+    @GetMapping("/partymembers/standardbearer/page")
+    public Result<PageData<UserStandaeBearerPage>> BrightFlagPartyMem(@RequestParam Map<String, Object> params) {
+        PageData<UserStandaeBearerPage> page = userService.BrightFlagPartyMem(params);
+        return new Result<PageData<UserStandaeBearerPage>>().ok(page);
+    }
 }
diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/user/dao/UserDao.java b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/user/dao/UserDao.java
index 2c50d399d..206ec4715 100644
--- a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/user/dao/UserDao.java
+++ b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/user/dao/UserDao.java
@@ -18,6 +18,7 @@
 package com.elink.esua.epdc.user.dao;
 
 import com.elink.esua.epdc.commons.mybatis.dao.BaseDao;
+import com.elink.esua.epdc.user.dto.UserStandaeBearerPage;
 import com.elink.esua.epdc.user.dto.epdc.result.*;
 import com.elink.esua.epdc.user.dto.epdc.result.StandardBearerStatusResultDTO;
 import com.elink.esua.epdc.user.dto.epdc.result.UserPartyStandardAppltResultDTO;
@@ -106,11 +107,10 @@ public interface UserDao extends BaseDao<UserEntity> {
     List<UserDTO> selectListUserDto(Map<String, Object> params);
 
     /**
-     *
      * 待认证党员
      *
-     * @params [params]
      * @return java.util.List<UserDTO>
+     * @params [params]
      * @author liuchuang
      * @since 2020/3/23 15:59
      */
@@ -215,11 +215,10 @@ public interface UserDao extends BaseDao<UserEntity> {
     CachingUserInfoDTO selectCachingUserInfoDTOByUserId(String userId);
 
     /**
-     *
      * 查询需要修改的组织机构信息
      *
-     * @params [deptId]
      * @return java.util.List<UserDTO>
+     * @params [deptId]
      * @author liuchuang
      * @since 2020/3/7 15:31
      */
@@ -236,11 +235,10 @@ public interface UserDao extends BaseDao<UserEntity> {
     List<UserDTO> selectAuthenticatedListUserDto(Map<String, Object> params);
 
     /**
-     *
      * 待认证居民
      *
-     * @params [params]
      * @return java.util.List<UserDTO>
+     * @params [params]
      * @author liuchuang
      * @since 2020/4/1 18:26
      */
@@ -265,23 +263,21 @@ public interface UserDao extends BaseDao<UserEntity> {
     List<UserDTO> selectListUserDtoByList(Map<String, Object> params);
 
     /**
-     *
      * 认证失败居民
      *
-     * @params [params]
      * @param params
      * @return java.util.List<UserDTO>
+     * @params [params]
      * @author wanggongfeng
      * @date 2020/5/22 13:18
      */
     List<UserDTO> selectFaildAuthenticatedListUserDto(Map<String, Object> params);
 
     /**
-     *
      * 待认证居民APP  &  已认证党员
      *
-     * @params [params]
      * @return java.util.List
+     * @params [params]
      * @author wanggongfeng
      * @since 2020/6/8 10:26
      */
@@ -316,6 +312,7 @@ public interface UserDao extends BaseDao<UserEntity> {
 
     /**
      * 根据用户ID查询产品库【user_base_info】是否存在该信息
+     *
      * @param userId
      * @return
      */
@@ -323,12 +320,14 @@ public interface UserDao extends BaseDao<UserEntity> {
 
     /**
      * 根据用户ID，清楚重复数据
+     *
      * @param userId
      */
     void deleteUserBaseInfoByUserId(@Param("userId") String userId);
 
     /**
      * 根据用户ID获取推送信息
+     *
      * @param userId
      * @return
      */
@@ -336,38 +335,44 @@ public interface UserDao extends BaseDao<UserEntity> {
 
     /**
      * 新增用户基础信息表信息
+     *
      * @param userBaseInfoDTO
      */
     void insertUserBaseInfo(EpmetUserBaseInfoDTO userBaseInfoDTO);
 
     /**
      * 更新用户基础信息表信息
+     *
      * @param userBaseInfoDTO
      */
     void updateUserBaseInfo(EpmetUserBaseInfoDTO userBaseInfoDTO);
 
     /**
      * 清除用户角色关系
+     *
      * @param userId
      */
     void deleteUserRoleByUserId(@Param("userId") String userId);
 
     /**
      * 新增用户角色关系
+     *
      * @param userId
      * @param roleId
      * @param gridId
      */
-    void insertUserRole(@Param("userId") String userId,@Param("roleId") String roleId, @Param("gridId") String gridId);
+    void insertUserRole(@Param("userId") String userId, @Param("roleId") String roleId, @Param("gridId") String gridId);
 
     /**
      * 清除用户
+     *
      * @param userId
      */
     void deleteUserByUserId(@Param("userId") String userId);
 
     /**
      * 新增用户
+     *
      * @param userId
      */
     void insertUser(@Param("userId") String userId);
@@ -375,6 +380,7 @@ public interface UserDao extends BaseDao<UserEntity> {
 
     /**
      * 根据用户ID查询产品库【user_resi_info】是否存在该信息
+     *
      * @param userId
      * @return
      */
@@ -382,6 +388,7 @@ public interface UserDao extends BaseDao<UserEntity> {
 
     /**
      * 根据用户ID获取推送信息
+     *
      * @param userId
      * @return
      */
@@ -389,40 +396,66 @@ public interface UserDao extends BaseDao<UserEntity> {
 
     /**
      * 根据用户ID，清楚重复数据
+     *
      * @param userId
      */
     void deleteUserResiInfoByUserId(@Param("userId") String userId);
 
     /**
      * 新增用户居民端注册信息表信息
+     *
      * @param userBaseInfoDTO
      */
     void insertUserResiInfo(EpmetUserResiInfoDTO userBaseInfoDTO);
 
     /**
      * 更新用户居民端注册信息表信息
+     *
      * @param userBaseInfoDTO
      */
     void updateUserResiInfo(EpmetUserResiInfoDTO userBaseInfoDTO);
 
     /**
      * 查询是否亮过党旗
+     *
      * @param userId
      */
     StandardBearerStatusResultDTO getBrightFlag(@Param("userId") String userId);
 
     /**
      * 查询user表其他字段
+     *
      * @param userId
      */
     UserPartyStandardAppltResultDTO queryUserPartyApply(@Param("userId") String userId);
 
     /**
      * 根据标签过滤用户ID
+     *
      * @param formDto
      * @return java.util.List<java.lang.String>
      * @author work@yujt.net.cn
      * @date 2022/4/28/0028 16:24
      */
     List<String> selectFilterUserIdListByTag(EpdcUserMatchTagFormDTO formDto);
+
+    /**
+     * 党员亮旗待审核-分页列表
+     *
+     * @param params
+     * @return java.util.List<com.elink.esua.epdc.user.dto.UserStandaeBearerPage>
+     * @author LZN
+     * @date 2022/4/29 9:33
+     */
+    List<UserStandaeBearerPage> partyMenFlagReviewPage(Map<String, Object> params);
+
+    /**
+     * 亮旗党员-分页列表
+     *
+     * @param params
+     * @return java.util.List<com.elink.esua.epdc.user.dto.UserStandaeBearerPage>
+     * @author LZN
+     * @date 2022/4/29 9:50
+     */
+    List<UserStandaeBearerPage> BrightFlagPartyMem(Map<String, Object> params);
 }
diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/user/service/UserService.java b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/user/service/UserService.java
index 8b03b5e5f..41d3a3591 100644
--- a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/user/service/UserService.java
+++ b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/user/service/UserService.java
@@ -435,6 +435,7 @@ public interface UserService extends BaseService<UserEntity> {
      * @date 2022/4/28 15:15
      */
     Result StandarBearerApply(String userId, String gridId);
+
     /***
      * 根据标签，过滤符合标签的用户ID
      * @param formDto
@@ -443,4 +444,24 @@ public interface UserService extends BaseService<UserEntity> {
      * @date 2022/4/28/0028 16:08
      */
     List<String> filterUserIdListByTag(EpdcUserMatchTagFormDTO formDto);
+
+    /**
+     * 党员亮旗待审核-分页列表
+     *
+     * @param params
+     * @return com.elink.esua.epdc.commons.tools.page.PageData<com.elink.esua.epdc.user.dto.UserStandaeBearerPage>
+     * @author LZN
+     * @date 2022/4/29 9:28
+     */
+    PageData<UserStandaeBearerPage> partyMenFlagReviewPage(Map<String, Object> params);
+
+    /**
+     * 亮旗党员-分页列表
+     *
+     * @param params
+     * @return com.elink.esua.epdc.commons.tools.page.PageData<com.elink.esua.epdc.user.dto.UserStandaeBearerPage>
+     * @author LZN
+     * @date 2022/4/29 9:49
+     */
+    PageData<UserStandaeBearerPage> BrightFlagPartyMem(Map<String, Object> params);
 }
diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/user/service/impl/UserServiceImpl.java b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/user/service/impl/UserServiceImpl.java
index f01d80662..3f5d11e81 100644
--- a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/user/service/impl/UserServiceImpl.java
+++ b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/user/service/impl/UserServiceImpl.java
@@ -1954,4 +1954,24 @@ public class UserServiceImpl extends BaseServiceImpl<UserDao, UserEntity> implem
         }
         return baseDao.selectFilterUserIdListByTag(formDto);
     }
+
+    @Override
+    public PageData<UserStandaeBearerPage> partyMenFlagReviewPage(Map<String, Object> params) {
+        this.verifyParams(params);
+        // 查询当前用户所具有的的数据权限
+        params.put("userId", SecurityUser.getUser().getId());
+        IPage<UserStandaeBearerPage> iPage = this.getPage(params);
+        List<UserStandaeBearerPage> list = this.baseDao.partyMenFlagReviewPage(params);
+        return new PageData<>(list, iPage.getTotal());
+    }
+
+    @Override
+    public PageData<UserStandaeBearerPage> BrightFlagPartyMem(Map<String, Object> params) {
+        this.verifyParams(params);
+        // 查询当前用户所具有的的数据权限
+        params.put("userId", SecurityUser.getUser().getId());
+        IPage<UserStandaeBearerPage> iPage = this.getPage(params);
+        List<UserStandaeBearerPage> list = this.baseDao.BrightFlagPartyMem(params);
+        return new PageData<>(list, iPage.getTotal());
+    }
 }
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 2a0dfa303..0b31a39b2 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
@@ -1796,6 +1796,70 @@
         AND r.USER_ID IN
         <foreach collection="userIdList" item="userId" open="(" separator="," close=")">#{userId}</foreach>
     </select>
+    <select id="partyMenFlagReviewPage" resultType="com.elink.esua.epdc.user.dto.UserStandaeBearerPage">
+        SELECT
+            u.REAL_NAME,
+            u.MOBILE,
+            u.ALL_DEPT_NAMES,
+            u.IDENTITY_NO,
+            u.address,
+            u.CREATED_TIME,
+            a.EXAMINE_FLAG AS examineStatus,
+            a.id,
+            a.USER_ID,
+            a.GRID_ID AS deptId,
+            a.REMARK
+        FROM
+            epdc_user u
+            LEFT JOIN epdc_party_standard_bearer_apply AS a ON u.id = a.USER_ID
+            AND a.DEL_FLAG = '0'
+        <where>
+                u.DEL_FLAG = '0'
+                AND a.USER_ID = #{userId}
+            <if test="realName != null and realName != ''">
+                AND u.REAL_NAME = #{realName}
+            </if>
+            <if test="deptId != null and deptId != ''">
+                AND a.GRID_ID = #{deptId}
+            </if>
+            <if test="examineStatus != null and examineStatus != ''">
+                AND a.EXAMINE_FLAG = #{examineStatus}
+            </if>
+            <if test="identityNo != null and identityNo != ''">
+                AND a.IDENTITY_NO = #{identityNo}
+            </if>
+        </where>
+    </select>
+    <select id="BrightFlagPartyMem" resultType="com.elink.esua.epdc.user.dto.UserStandaeBearerPage">
+        SELECT
+            u.REAL_NAME,
+            u.MOBILE,
+            u.ALL_DEPT_NAMES,
+            u.IDENTITY_NO,
+            u.address,
+            u.CREATED_TIME,
+            a.EXAMINE_FLAG AS examineStatus,
+            a.id,
+            a.USER_ID,
+            a.GRID_ID AS deptId,
+            a.REMARK
+        FROM
+            epdc_user u
+            LEFT JOIN epdc_party_standard_bearer_apply AS a ON u.id = a.USER_ID
+            AND a.DEL_FLAG = '0'
+        <where>
+            u.del_flag = '0'
+            AND u.IDENTITY_NO = #{identityNo}
+            AND a.USER_ID = #{userId}
+            <if test="realName != null and realName != ''">
+                AND u.REAL_NAME = #{realName}
+            </if>
+            <if test="deptId != null and deptId != ''">
+                AND a.GRID_ID = #{deptId}
+            </if>
+
+        </where>
+    </select>
 
 
     <insert id="insertUserResiInfo" parameterType="com.elink.esua.epdc.user.dto.product.result.EpmetUserResiInfoDTO">