From 297fe673bd4cbef746341f4c5841e54d684508fa Mon Sep 17 00:00:00 2001
From: Jackwang <wt373747285@163.com>
Date: Fri, 21 Aug 2020 15:20:23 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=90=E5=A4=A7=E5=B1=8F=E5=B1=95=E7=A4=BA?=
 =?UTF-8?q?=E3=80=91-=E3=80=90=E5=85=9A=E5=91=98=E5=9F=BA=E6=9C=AC?=
 =?UTF-8?q?=E6=83=85=E5=86=B5=E7=94=A8=E6=88=B7=E9=83=A8=E9=97=A8=E8=8E=B7?=
 =?UTF-8?q?=E5=8F=96=E9=80=BB=E8=BE=91=E8=B0=83=E6=95=B4=E3=80=91-?=
 =?UTF-8?q?=EF=BC=88=E7=8E=8B=E7=AB=A5=EF=BC=89-2020/8/21?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mapper/screen/DataStatsScreencollDao.xml  | 80 ++++++++++++++-----
 1 file changed, 62 insertions(+), 18 deletions(-)

diff --git a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/resources/mapper/screen/DataStatsScreencollDao.xml b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/resources/mapper/screen/DataStatsScreencollDao.xml
index c7a167f0f..1b2e94953 100644
--- a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/resources/mapper/screen/DataStatsScreencollDao.xml
+++ b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/resources/mapper/screen/DataStatsScreencollDao.xml
@@ -4,7 +4,7 @@
 <mapper namespace="com.elink.esua.epdc.modules.screen.dao.DataStatsScreencollDao">
 
     <select id="cpcbasedata" resultType="com.elink.esua.epdc.dto.screen.result.CpcbasedataDTO">
-            SELECT
+        SELECT
                 total.orgId,
                 total.orgName,
                 total.parentId,
@@ -45,13 +45,24 @@
                                         count( ( 60 <![CDATA[<]]> t.age AND t.PARTY_FLAG = '1') OR NULL ) AS ageLevel6
                                     FROM
                                         (SELECT
-                                                eu.ID,
-                                                eu.PARTY_FLAG,
-                                                IFNULL( TIMESTAMPDIFF( YEAR, eu.BIRTHDAY, CURDATE( ) ), 0 ) AS age,
-                                                d.id AS orgId
+                                                e.ID,
+                                                e.PARTY_FLAG,
+                                                IFNULL( TIMESTAMPDIFF( YEAR, e.BIRTHDAY, CURDATE( ) ), 0 ) AS age,
+                                                d.id as orgId
                                             FROM
                                             esua_epdc_admin.sys_dept d
-                                            left join esua_epdc_user.epdc_user eu on d.id=eu.DEPT_ID and eu.DEL_FLAG = '0'
+                                            left join (select eu.id,
+                                                                    eu.BIRTHDAY,
+                                                                    (select ifnull(if(eu.DEPT_ID = 0, NULL, eu.DEPT_ID), (
+                                                                         SELECT  GRID_ID FROM esua_epdc_user.epdc_user_grid_relation
+                                                                         WHERE DEL_FLAG = '0' AND USER_ID = eu.ID
+                                                                         ORDER BY
+                                                                             CREATED_TIME,id
+                                                                         LIMIT 1 )
+                                                                )) AS orgId,
+                                                                eu.PARTY_FLAG
+                                                        from esua_epdc_user.epdc_user eu
+                                                        where eu.DEL_FLAG = '0' )e on d.id=e.orgId
                                             WHERE
                                                 d.DEL_FLAG = '0'
                                                 and d.type_key='grid_party'
@@ -108,14 +119,25 @@
                                         count( ( 60 <![CDATA[<]]> t.age AND t.PARTY_FLAG = '1') OR NULL ) AS ageLevel6
                                     FROM
                                         (SELECT
-                                                eu.ID,
-                                                eu.PARTY_FLAG,
-                                                IFNULL( TIMESTAMPDIFF( YEAR, eu.BIRTHDAY, CURDATE( ) ), 0 ) AS age,
+                                                e.ID,
+                                                e.PARTY_FLAG,
+                                                IFNULL( TIMESTAMPDIFF( YEAR, e.BIRTHDAY, CURDATE( ) ), 0 ) AS age,
                                                 co.id AS orgId
                                             FROM
                                             esua_epdc_admin.sys_dept co
                                             left join esua_epdc_admin.sys_dept gr on gr.pid=co.id
-                                            left join esua_epdc_user.epdc_user eu on gr.id=eu.DEPT_ID and eu.DEL_FLAG = '0'
+                                            left join (select eu.id,
+                                                                eu.BIRTHDAY,
+                                                                (select ifnull(if(eu.DEPT_ID = 0, NULL, eu.DEPT_ID), (
+                                                                     SELECT  GRID_ID FROM esua_epdc_user.epdc_user_grid_relation
+                                                                     WHERE DEL_FLAG = '0' AND USER_ID = eu.ID
+                                                                     ORDER BY
+                                                                         CREATED_TIME,id
+                                                                     LIMIT 1 )
+                                                            )) AS orgId,
+                                                            eu.PARTY_FLAG
+                                                    from esua_epdc_user.epdc_user eu
+                                                    where eu.DEL_FLAG = '0' )e on gr.id=e.orgId
                                             WHERE
                                                 co.DEL_FLAG = '0'
                                                 and gr.DEL_FLAG = '0'
@@ -173,15 +195,26 @@
                                         count( ( 60 <![CDATA[<]]> t.age AND t.PARTY_FLAG = '1') OR NULL ) AS ageLevel6
                                     FROM
                                         (SELECT
-                                                eu.ID,
-                                                eu.PARTY_FLAG,
-                                                IFNULL( TIMESTAMPDIFF( YEAR, eu.BIRTHDAY, CURDATE( ) ), 0 ) AS age,
+                                                e.ID,
+                                                e.PARTY_FLAG,
+                                                IFNULL( TIMESTAMPDIFF( YEAR, e.BIRTHDAY, CURDATE( ) ), 0 ) AS age,
                                                 st.id AS orgId
                                             FROM
                                             esua_epdc_admin.sys_dept st
                                             left join esua_epdc_admin.sys_dept co on co.pid=st.id
                                             left join esua_epdc_admin.sys_dept gr on gr.pid=co.id
-                                            left join esua_epdc_user.epdc_user eu on gr.id=eu.DEPT_ID and eu.DEL_FLAG = '0'
+                                            left join (select eu.id,
+                                                                eu.BIRTHDAY,
+                                                                (select ifnull(if(eu.DEPT_ID = 0, NULL, eu.DEPT_ID), (
+                                                                     SELECT  GRID_ID FROM esua_epdc_user.epdc_user_grid_relation
+                                                                     WHERE DEL_FLAG = '0' AND USER_ID = eu.ID
+                                                                     ORDER BY
+                                                                         CREATED_TIME,id
+                                                                     LIMIT 1 )
+                                                            )) AS orgId,
+                                                            eu.PARTY_FLAG
+                                                    from esua_epdc_user.epdc_user eu
+                                                    where eu.DEL_FLAG = '0' )e on gr.id=e.orgId
                                             WHERE
                                                 st.DEL_FLAG = '0'
                                                 and co.DEL_FLAG = '0'
@@ -241,16 +274,27 @@
                                         count( ( 60 <![CDATA[<]]> t.age AND t.PARTY_FLAG = '1') OR NULL ) AS ageLevel6
                                     FROM
                                         (SELECT
-                                                eu.ID,
-                                                eu.PARTY_FLAG,
-                                                IFNULL( TIMESTAMPDIFF( YEAR, eu.BIRTHDAY, CURDATE( ) ), 0 ) AS age,
+                                                e.ID,
+                                                e.PARTY_FLAG,
+                                                IFNULL( TIMESTAMPDIFF( YEAR, e.BIRTHDAY, CURDATE( ) ), 0 ) AS age,
                                                 city.id AS orgId
                                             FROM
                                             esua_epdc_admin.sys_dept city
                                             left join esua_epdc_admin.sys_dept st on st.pid=city.id
                                             left join esua_epdc_admin.sys_dept co on co.pid=st.id
                                             left join esua_epdc_admin.sys_dept gr on gr.pid=co.id
-                                            left join esua_epdc_user.epdc_user eu on gr.id=eu.DEPT_ID and eu.DEL_FLAG = '0'
+                                            left join (select eu.id,
+                                                                eu.BIRTHDAY,
+                                                                (select ifnull(if(eu.DEPT_ID = 0, NULL, eu.DEPT_ID), (
+                                                                     SELECT  GRID_ID FROM esua_epdc_user.epdc_user_grid_relation
+                                                                     WHERE DEL_FLAG = '0' AND USER_ID = eu.ID
+                                                                     ORDER BY
+                                                                         CREATED_TIME,id
+                                                                     LIMIT 1 )
+                                                            )) AS orgId,
+                                                            eu.PARTY_FLAG
+                                                    from esua_epdc_user.epdc_user eu
+                                                    where eu.DEL_FLAG = '0' )e on gr.id=e.orgId
                                             WHERE
                                                 city.DEL_FLAG = '0'
                                                 and st.DEL_FLAG = '0'