From 42e4643703b33c16fbfaeccfd920ae48b73069a0 Mon Sep 17 00:00:00 2001
From: songyunpeng <syp2850@163.com>
Date: Tue, 13 Oct 2020 17:29:46 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BD=91=E6=A0=BC=E5=BC=80=E9=80=9A=E6=83=85?=
 =?UTF-8?q?=E5=86=B5=20=E5=B1=85=E6=B0=91=E6=95=B0=E9=87=8F=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../resources/mapper/user/UserAnalysisDao.xml | 58 ++-----------------
 1 file changed, 5 insertions(+), 53 deletions(-)

diff --git a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/resources/mapper/user/UserAnalysisDao.xml b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/resources/mapper/user/UserAnalysisDao.xml
index 234301b0..6bb7acd6 100644
--- a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/resources/mapper/user/UserAnalysisDao.xml
+++ b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/resources/mapper/user/UserAnalysisDao.xml
@@ -160,61 +160,13 @@
         SELECT
         user.DEPT_ID gridId,
         COUNT(user.ID) AS registerCount,
-        COUNT((user.AUTHENTICATED_TYPE = '0' AND user.AUTHENTICATED_FLAG = '1') OR (user.AUTHENTICATED_TYPE = '1' AND user.AUTHENTICATED_FLAG = '0' AND user.HistoryCount > 0) OR NULL) AS residentCount ,
-        COUNT((user.AUTHENTICATED_TYPE = '1' AND user.AUTHENTICATED_FLAG = '1') OR NULL) AS partyCount
+        COUNT(user.PARTY_FLAG ='0' OR NULL) AS residentCount ,
+        COUNT(user.PARTY_FLAG ='1' OR NULL) AS partyCount
         FROM
         (
-        select newuu.ID,newuu.AUTHENTICATED_TYPE,newuu.AUTHENTICATED_FLAG,newuu.HistoryCount,newuu.DEPT_ID from (
+        select newuu.ID,newuu.DEPT_ID,newuu.PARTY_FLAG from (
         SELECT
-        DISTINCT uu.ID,uu.DEL_FLAG,uu.CREATED_TIME,
-        (
-            SELECT
-            AUTHENTICATED_TYPE
-            FROM
-        esua_epdc_user.epdc_user_authenticate_history
-            WHERE
-            DEL_FLAG = '0'
-            AND AUTHENTICATED_TYPE IN ( '0', '1' )
-            <if test="endTime != ''">
-                and DATE_FORMAT(CREATED_TIME,'%Y-%m-%d') &lt;= #{endTime}
-            </if>
-            AND USER_ID = uu.ID
-            ORDER BY
-            CREATED_TIME DESC,
-            id
-            LIMIT 1
-        ) AS AUTHENTICATED_TYPE,
-        (
-            SELECT
-            AUTHENTICATED_FLAG
-            FROM
-        esua_epdc_user.epdc_user_authenticate_history
-            WHERE
-            DEL_FLAG = '0'
-            AND AUTHENTICATED_TYPE IN ( '0', '1' )
-            <if test="endTime != ''">
-                and DATE_FORMAT(CREATED_TIME,'%Y-%m-%d') &lt;= #{endTime}
-            </if>
-            AND USER_ID = uu.ID
-            ORDER BY
-            CREATED_TIME DESC ,
-            id
-            LIMIT 1
-        ) AS AUTHENTICATED_FLAG,
-        (
-            SELECT
-            count( id ) AS HistoryCount
-            FROM
-        esua_epdc_user.epdc_user_authenticate_history
-            WHERE
-            DEL_FLAG = '0'
-            AND AUTHENTICATED_TYPE IN ( '0', '1' )
-            AND AUTHENTICATED_FLAG = '1'
-            <if test="endTime != ''">
-                and DATE_FORMAT(CREATED_TIME,'%Y-%m-%d') &lt;= #{endTime}
-            </if>
-            AND USER_ID = uu.ID
-        ) AS HistoryCount,
+        DISTINCT uu.ID,uu.DEL_FLAG,uu.CREATED_TIME,PARTY_FLAG,REGISTER_TIME,
         ifnull(if(uu.DEPT_ID = 0, NULL, uu.DEPT_ID), (
             SELECT  GRID_ID FROM esua_epdc_user.epdc_user_grid_relation
             WHERE DEL_FLAG = '0' AND USER_ID = uu.ID
@@ -230,7 +182,7 @@
             AND newuu.DEPT_ID in <include refid="foreachGridIdList"></include>
         </if>
         <if test="startTime != null and endTime != null and endTime != ''">
-            AND DATE_FORMAT(newuu.CREATED_TIME,'%Y-%m-%d') BETWEEN #{startTime} AND #{endTime}
+            AND DATE_FORMAT(newuu.REGISTER_TIME,'%Y-%m-%d') BETWEEN #{startTime} AND #{endTime}
         </if>
         ) user
         GROUP BY user.DEPT_ID