From 76bc347e1939a464f21dcfb9215aff9d8f357f4f Mon Sep 17 00:00:00 2001
From: songyunpeng <syp2850@163.com>
Date: Fri, 12 Jun 2020 13:23:25 +0800
Subject: [PATCH] =?UTF-8?q?pc=E5=BE=85=E8=AE=A4=E8=AF=81=E5=B1=85=E6=B0=91?=
 =?UTF-8?q?=E7=AD=89=E5=88=97=E8=A1=A8=E5=90=8C=E5=B7=A5=E4=BD=9C=E7=AB=AF?=
 =?UTF-8?q?=E5=90=8C=E6=AD=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/elink/esua/epdc/dao/UserDao.java |  8 ++
 .../epdc/service/impl/UserServiceImpl.java    |  9 +-
 .../mapper/PartyAuthenticationFailedDao.xml   |  5 +-
 .../src/main/resources/mapper/UserDao.xml     | 85 +++++++++++++------
 4 files changed, 76 insertions(+), 31 deletions(-)

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 2d2a1d9e..2e739c2a 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
@@ -256,4 +256,12 @@ public interface UserDao extends BaseDao<UserEntity> {
      * @return java.util.List<com.elink.esua.epdc.dto.UserDTO>
      **/
     List<UserDTO> selectListOfWaitPartyUserDto(Map<String, Object> params);
+    /**
+     * @Description  工作端待认证居民 
+     * @Author songyunpeng
+     * @Date  2020/6/12
+     * @Param [workUserFromDto]
+     * @return java.util.List<com.elink.esua.epdc.dto.epdc.result.EpdcWorkUserResultDTO>
+     **/
+    List<EpdcWorkUserResultDTO> selectWorkResidentUserList(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 8713366c..b8087c6a 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
@@ -805,8 +805,13 @@ public class UserServiceImpl extends BaseServiceImpl<UserDao, UserEntity> implem
             return new Result<List<EpdcWorkUserResultDTO>>().ok(epdcWorkUserResultDTOS);
         }
         workUserFromDto.setAuthenticatedFlag(state);
-
-        List<EpdcWorkUserResultDTO> epdcWorkUserResultDTOS = baseDao.selectWorkUserList(workUserFromDto);
+        //如果是居民
+        List<EpdcWorkUserResultDTO> epdcWorkUserResultDTOS;
+        if("0".equals(workUserFromDto.getPartyFlag()) && "0".equals(authenticatedFlag)){
+            epdcWorkUserResultDTOS = baseDao.selectWorkResidentUserList(workUserFromDto);
+        }else {
+            epdcWorkUserResultDTOS = baseDao.selectWorkUserList(workUserFromDto);
+        }
         return new Result<List<EpdcWorkUserResultDTO>>().ok(epdcWorkUserResultDTOS);
     }
 
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 1d3aa5f8..3dabde23 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
@@ -43,14 +43,17 @@
           epaf.USER_ID,
           epaf.ALL_DEPT_NAMES
         FROM epdc_party_authentication_failed epaf
+        left join epdc_user eu on eu.ID = epaf.USER_ID
         WHERE
-          epaf.del_flag = '0'
+          epaf.del_flag = '0' and eu.DEL_FLAG = '0'
           <if test="startTime != null and startTime != '' and endTime != null and endTime != ''">
               and epaf.created_time between #{startTime} and #{endTime}
           </if>
           <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
+        eu.ID
         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 e76edea3..58f2c16e 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
@@ -291,17 +291,20 @@
         u.REGISTER_TIME as registerTime,
         u.FACE_IMG as faceImg
         FROM
-        epdc_user_grid_relation ug
-        LEFT JOIN epdc_user u ON ug.USER_ID = u.ID
+        (
+        select  u.ID,
+        u.NICKNAME ,
+        u.FACE_IMG,
+        if(u.DEPT_ID is null or u.DEPT_ID= '0',ug.GRID_ID,u.DEPT_ID) as GRID_ID,
+        u.REGISTER_TIME from epdc_user u
+        LEFT JOIN ( select * from (select * from epdc_user_grid_relation order by CREATED_TIME)t group by t.USER_ID)ug ON ug.USER_ID = u.ID AND ug.DEL_FLAG = '0'
+        where u.DEL_FLAG ='0' and u.PARTY_FLAG = #{partyFlag} AND u.STATE = #{authenticatedFlag}
+        )u
         WHERE
-        u.PARTY_FLAG = #{partyFlag}
-        AND u.STATE = #{authenticatedFlag}
-        AND u.DEL_FLAG = '0'
-        AND ug.DEL_FLAG = '0'
         <choose>
-            <when test="gridId != null and gridId > 0">AND ug.GRID_ID = #{gridId}</when>
+            <when test="gridId != null and gridId > 0">u.GRID_ID = #{gridId}</when>
             <otherwise>
-                AND ug.GRID_ID in
+                u.GRID_ID in
                 <foreach collection="gridIdList" item="item" open="(" separator="," close=")">
                     #{item}
                 </foreach>
@@ -309,7 +312,7 @@
         </choose>
         GROUP BY
         u.ID
-        ORDER BY u.CREATED_TIME DESC
+        ORDER BY u.REGISTER_TIME DESC
         LIMIT #{pageIndex},#{pageSize}
     </select>
 
@@ -338,26 +341,18 @@
     <select id="selectPartyAuthenticationFailedList" parameterType="com.elink.esua.epdc.dto.epdc.form.EpdcWorkUserFromDTO"
             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
-        LEFT JOIN epdc_user u ON ug.USER_ID = u.ID
-        WHERE u.DEL_FLAG = '0'
-        AND ug.DEL_FLAG = '0'
-        and u.PARTY_FLAG = '0'
-        <if test="partyFlag ='0' and authenticatedFlag ='1'">
-            and EXISTS(select m.USER_ID
-            from epdc_party_authentication_failed m
-            where m.USER_ID=u.id)
-        </if>
+        eu.ID as userId,
+        eu.NICKNAME as nickname,
+        eu.REGISTER_TIME as registerTime,
+        eu.FACE_IMG as faceImg
+        FROM epdc_party_authentication_failed m
+        left join epdc_user eu on eu.ID = m.USER_ID
+        where m.DEL_FLAG = '0' and eu.DEL_FLAG = '0'
         <choose>
-            <when test="gridId != null and gridId > 0">AND ug.GRID_ID = #{gridId}</when>
+            <when test="gridId != null and gridId > 0">AND eu.DEPT_ID = #{gridId}</when>
             <otherwise>
             <if test="gridIdList!=null and gridIdList.size()>0">
-                AND ug.GRID_ID in
+                AND eu.DEPT_ID in
                 <foreach collection="gridIdList" item="item" open="(" separator="," close=")">
                     #{item}
                 </foreach>
@@ -365,8 +360,8 @@
             </otherwise>
         </choose>
         GROUP BY
-        u.ID
-        ORDER BY u.CREATED_TIME DESC
+        eu.ID
+        ORDER BY m.CREATED_TIME DESC
         LIMIT #{pageIndex},#{pageSize}
     </select>
 
@@ -743,4 +738,38 @@
         ORDER BY
         u.register_time desc
     </select>
+
+
+    <!--获取用户列表-->
+    <select id="selectWorkResidentUserList" 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
+        (
+        select  u.ID,
+        u.NICKNAME ,
+        u.FACE_IMG,
+        if(u.DEPT_ID is null or u.DEPT_ID= '0',ug.GRID_ID,u.DEPT_ID) as GRID_ID,
+        u.REGISTER_TIME from epdc_user u
+        LEFT JOIN ( select * from (select * from epdc_user_grid_relation order by CREATED_TIME)t group by t.USER_ID)ug ON ug.USER_ID = u.ID AND ug.DEL_FLAG = '0'
+        where u.DEL_FLAG ='0' and u.PARTY_FLAG = #{partyFlag} AND u.STATE = #{authenticatedFlag} and (u.IDENTITY_NO is null or u.IDENTITY_NO = '')
+        )u
+        WHERE
+        <choose>
+            <when test="gridId != null and gridId > 0">u.GRID_ID = #{gridId}</when>
+            <otherwise>
+                u.GRID_ID in
+                <foreach collection="gridIdList" item="item" open="(" separator="," close=")">
+                    #{item}
+                </foreach>
+            </otherwise>
+        </choose>
+        GROUP BY
+        u.ID
+        ORDER BY u.REGISTER_TIME DESC
+        LIMIT #{pageIndex},#{pageSize}
+    </select>
 </mapper>