From 9524fa80d0b49590b08e4e893cd207909a7c5da0 Mon Sep 17 00:00:00 2001
From: wanggongfeng <1305282856@qq.com>
Date: Mon, 8 Jun 2020 17:23:38 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=90=E5=B7=A5=E4=BD=9C=E7=AB=AF=E5=B0=8F?=
 =?UTF-8?q?=E7=A8=8B=E5=BA=8F=E3=80=91=E7=94=A8=E6=88=B7=E7=AE=A1=E7=90=86?=
 =?UTF-8?q?=E6=95=B0=E6=8D=AE=E6=9F=A5=E8=AF=A2=E6=94=B9=E4=B8=BA=E4=B8=8E?=
 =?UTF-8?q?PC=E4=B8=80=E8=87=B4-=E7=8E=8B=E5=85=AC=E5=B3=B0-2020-06-08?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../dto/epdc/form/EpdcWorkUserFromDTO.java    |   5 +
 .../java/com/elink/esua/epdc/dao/UserDao.java |  29 ++++
 .../epdc/service/impl/UserServiceImpl.java    |  23 ++-
 .../mapper/PartyAuthenticationFailedDao.xml   |   2 +
 .../src/main/resources/mapper/UserDao.xml     | 162 ++++++++++++++++++
 5 files changed, 218 insertions(+), 3 deletions(-)

diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/epdc/form/EpdcWorkUserFromDTO.java b/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/epdc/form/EpdcWorkUserFromDTO.java
index 695a21fc7..06550dedb 100644
--- a/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/epdc/form/EpdcWorkUserFromDTO.java
+++ b/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;
+
 }
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 d9c83f770..953df7394 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
@@ -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);
+
 
 }
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 e8113672b..9a63a0f5f 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
@@ -1078,8 +1078,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)) {
@@ -1094,9 +1112,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
diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/resources/mapper/PartyAuthenticationFailedDao.xml b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/resources/mapper/PartyAuthenticationFailedDao.xml
index 1d3aa5f89..db658a71f 100644
--- a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/resources/mapper/PartyAuthenticationFailedDao.xml
+++ b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/resources/mapper/PartyAuthenticationFailedDao.xml
@@ -51,6 +51,8 @@
           <if test="identityNo != '' and identityNo != null"> and epaf.IDENTITY_NO = #{identityNo}</if>
           <if test="realName != '' and realName != null"> and epaf.real_name = #{realName}</if>
           <if test="mobile != '' and mobile != null"> and epaf.mobile = #{mobile}</if>
+        GROUP BY epaf.USER_ID
+        HAVING epaf.CREATED_TIME = MAX(epaf.CREATED_TIME)
         ORDER BY
         epaf.CREATED_TIME desc
     </select>
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 81d88703c..79eebb62b 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
@@ -1277,4 +1277,166 @@
         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
+        <if test="selectFlag == '0'">
+            user.AUTHENTICATED_TYPE = '0' AND user.AUTHENTICATED_FLAG = '2'
+        </if>
+        <if test="selectFlag == '1'">
+            user.AUTHENTICATED_TYPE = '1' and user.AUTHENTICATED_FLAG = '1'
+        </if>
+        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'
+    </select>
+
 </mapper>