【工作端小程序】首页待认证居民数量-王公峰-2020-07-31

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

@@ -305,22 +305,52 @@
     <!--查询待认证用户数量-->
     <select id="selectCountUnauthorizedAmount" resultType="Integer">
         SELECT
-        COUNT(DISTINCT(u.ID))
+        count(*)
+        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_grid_relation ug
-        LEFT JOIN epdc_user u ON u.ID = ug.USER_ID
-        WHERE
-        u.PARTY_FLAG = '0'AND
-        u.DEL_FLAG = '0' AND ug.DEL_FLAG = '0' AND u.STATE = '1'
+        epdc_user u
+        where  u.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 u.DEPT_ID = #{gridId}</when>
             <otherwise>
-                AND ug.GRID_ID in
-                <foreach collection="gridIdList" item="item" open="(" separator="," close=")">
-                    #{item}
-                </foreach>
+                <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 = '2'
     </select>
 
     <!--  获取用户列表：党员认证失败  -->