修改已注册居民数=待认证+已认证+失败

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

@@ -321,7 +321,8 @@
     </select>
 
     <!--  获取用户列表：党员认证失败  -->
-    <select id="selectPartyAuthenticationFailedList" parameterType="com.elink.esua.epdc.dto.epdc.form.EpdcWorkUserFromDTO"
+    <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,
@@ -342,12 +343,12 @@
         <choose>
             <when test="gridId != null and gridId > 0">AND ug.GRID_ID = #{gridId}</when>
             <otherwise>
-            <if test="gridIdList!=null and gridIdList.size()>0">
-                AND ug.GRID_ID in
-                <foreach collection="gridIdList" item="item" open="(" separator="," close=")">
-                    #{item}
-                </foreach>
-            </if>
+                <if test="gridIdList!=null and gridIdList.size()>0">
+                    AND ug.GRID_ID in
+                    <foreach collection="gridIdList" item="item" open="(" separator="," close=")">
+                        #{item}
+                    </foreach>
+                </if>
             </otherwise>
         </choose>
         GROUP BY
@@ -357,44 +358,45 @@
     </select>
 
     <!-- 根据网格id查询网格下所有的用户 -->
-    <select id="selectListGridUserResultDTO" parameterType="map" resultType="com.elink.esua.epdc.dto.epdc.result.EpdcGridUserResultDTO">
+    <select id="selectListGridUserResultDTO" parameterType="map"
+            resultType="com.elink.esua.epdc.dto.epdc.result.EpdcGridUserResultDTO">
         SELECT
-            eu.id AS userId,
-            eu.NICKNAME,
-            eu.FACE_IMG AS userAvatar,
-            eu.MOBILE,
-            r.LEADER_FLAG AS lordFlag,
-            eu.PARTY_FLAG AS partyMember,
-            10 as STATE,
-            NULL AS auditOpinion,
-            r.GRID_ID AS gridId
+        eu.id AS userId,
+        eu.NICKNAME,
+        eu.FACE_IMG AS userAvatar,
+        eu.MOBILE,
+        r.LEADER_FLAG AS lordFlag,
+        eu.PARTY_FLAG AS partyMember,
+        10 as STATE,
+        NULL AS auditOpinion,
+        r.GRID_ID AS gridId
         FROM
-            epdc_user_grid_relation r
-            LEFT JOIN epdc_user eu ON r.USER_ID = eu.ID
+        epdc_user_grid_relation r
+        LEFT JOIN epdc_user eu ON r.USER_ID = eu.ID
         WHERE
-            r.DEL_FLAG = '0'
-            AND eu.DEL_FLAG = '0'
-            and (eu.PARTY_FLAG='1' or r.LEADER_FLAG='1')
-            <if test="gridIdList!=null and  gridIdList.size()>0">
-                AND r.GRID_ID in
-                <foreach collection="gridIdList" index="index" item="gridId" open="(" separator="," close=")">
-                    #{gridId}
-                </foreach>
-            </if>
+        r.DEL_FLAG = '0'
+        AND eu.DEL_FLAG = '0'
+        and (eu.PARTY_FLAG='1' or r.LEADER_FLAG='1')
+        <if test="gridIdList!=null and  gridIdList.size()>0">
+            AND r.GRID_ID in
+            <foreach collection="gridIdList" index="index" item="gridId" open="(" separator="," close=")">
+                #{gridId}
+            </foreach>
+        </if>
     </select>
 
     <select id="selectListUserByWxForLogin" resultType="com.elink.esua.epdc.dto.UserDTO">
         SELECT
-            u.ID, u.NICKNAME, u.FACE_IMG, u.MOBILE, u.PARTY_FLAG, u.REAL_NAME, u.SEX, u.STATE, ur.GRID_ID, ur.GRID
+        u.ID, u.NICKNAME, u.FACE_IMG, u.MOBILE, u.PARTY_FLAG, u.REAL_NAME, u.SEX, u.STATE, ur.GRID_ID, ur.GRID
         FROM
-            epdc_user u
-            LEFT JOIN epdc_user_grid_relation ur ON u.ID = ur.USER_ID AND ur.DEL_FLAG = '0'
+        epdc_user u
+        LEFT JOIN epdc_user_grid_relation ur ON u.ID = ur.USER_ID AND ur.DEL_FLAG = '0'
         WHERE
-            u.DEL_FLAG = '0'
-            <if test="wxOpenId != null and wxOpenId !=''">AND u.WX_OPEN_ID = #{wxOpenId}</if>
-            <if test="wxUnionId != null and wxUnionId !=''">AND u.WX_UNION_ID = #{wxUnionId}</if>
+        u.DEL_FLAG = '0'
+        <if test="wxOpenId != null and wxOpenId !=''">AND u.WX_OPEN_ID = #{wxOpenId}</if>
+        <if test="wxUnionId != null and wxUnionId !=''">AND u.WX_UNION_ID = #{wxUnionId}</if>
         ORDER BY
-            ur.SWITCHED_TIME DESC
+        ur.SWITCHED_TIME DESC
     </select>
 
     <select id="selectListOfOrganizationInfo" resultType="com.elink.esua.epdc.dto.UserDTO">
@@ -445,8 +447,8 @@
             OR find_in_set(#{communityId},u.ALL_DEPT_IDS))
         </if>
         <if test="gridId != '' and gridId != null">
-            and (u.grid_id = #{gridId}
-            OR find_in_set(#{gridId},u.ALL_DEPT_IDS))
+            AND
+            find_in_set(#{gridId},u.ALL_DEPT_IDS)
         </if>
         ORDER BY
         u.register_time desc