From c466b665537f9c7e77716a49f7a4b436bcf2735b Mon Sep 17 00:00:00 2001
From: songyunpeng <syp2850@163.com>
Date: Wed, 2 Jun 2021 14:10:41 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E7=BD=91=E6=A0=BC=E5=91=98?=
 =?UTF-8?q?=E6=95=B0=E9=87=8F=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mapper/screen/ScreenPublicDataDao.xml     | 59 ++++++++++++++++---
 1 file changed, 51 insertions(+), 8 deletions(-)

diff --git a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/resources/mapper/screen/ScreenPublicDataDao.xml b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/resources/mapper/screen/ScreenPublicDataDao.xml
index 262c057c..1802e3a5 100644
--- a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/resources/mapper/screen/ScreenPublicDataDao.xml
+++ b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/resources/mapper/screen/ScreenPublicDataDao.xml
@@ -68,7 +68,7 @@
     <!-- 010 -->
     <select id="usertotaldata" resultType="com.elink.esua.epdc.dto.screen.result.UsertotaldataResultDTO">
 
-            SELECT gr.id as orgId,
+           SELECT gr.id as orgId,
                  gr.name as orgName,
                  gr.pid as parentId,
                 'grid' as orgType,
@@ -79,7 +79,11 @@
                  IFNULL(t.topicTotal,0) AS topicTotal,
                  IFNULL(t.projectTotal,0) as projectTotal, 0 as companyTotal,
                  DATE_FORMAT(now(),'%Y%m%d') as dataEndTime,
-                 gr.area_code AS areaCode
+                 gr.area_code AS areaCode,
+                ifnull((select count(su.id) from
+                    esua_epdc_admin.sys_user su
+                    left join esua_epdc_admin.sys_role_user sru on sru.user_id = su.id
+                    where su.dept_id = gr.id and sru.role_id = '1215214913362874370' group by su.dept_id),0)as gridMemberTotal
     FROM esua_epdc_admin.sys_dept gr
     left join
         (select  total.GRID_ID,
@@ -211,8 +215,20 @@ UNION ALL
                  SUM(IFNULL(t.topicTotal,0)) AS topicTotal,
                  SUM(IFNULL(t.projectTotal,0)) as projectTotal, 0 as companyTotal,
                 DATE_FORMAT(now(),'%Y%m%d') as dataEndTime,
-                 co.area_code AS areaCode
-    FROM esua_epdc_admin.sys_dept co
+                 co.area_code AS areaCode,
+           (select count(su.id) from
+                    esua_epdc_admin.sys_user su
+                    left join esua_epdc_admin.sys_role_user sru on sru.user_id = su.id
+                    where su.dept_id = co.id and sru.role_id = '1215214913362874370')
+                    +
+             (select count(su.id) from
+                    esua_epdc_admin.sys_user su
+                    left join esua_epdc_admin.sys_role_user sru on sru.user_id = su.id
+                    left join esua_epdc_admin.sys_dept grid on grid.id = su.dept_id and grid.del_flag='0'
+                    left join esua_epdc_admin.sys_dept community on community.id = grid.pid and community.del_flag='0'
+                    where  sru.role_id = '1215214913362874370' and community.id = co.id group by community.id)as gridMemberTotal
+
+FROM esua_epdc_admin.sys_dept co
     LEFT JOIN esua_epdc_admin.sys_dept gr on co.id=gr.pid
     left join
         (select  total.GRID_ID,
@@ -221,7 +237,8 @@ UNION ALL
                          sum(total.groupTotal) as groupTotal,
                          sum(total.issueTotal) as issueTotal,
                          sum(total.topicTotal) as topicTotal,
-                         sum(total.projectTotal) as projectTotal, 0 as companyTotal
+                         sum(total.projectTotal) as projectTotal,
+                         0 as companyTotal
             from
             (select eu.DEPT_ID AS GRID_ID,
                         count(eu.id) as userTotal,
@@ -345,7 +362,20 @@ union all
                  SUM(IFNULL(t.topicTotal,0)) AS topicTotal,
                  SUM(IFNULL(t.projectTotal,0)) as projectTotal, 0 as companyTotal,
                 DATE_FORMAT(now(),'%Y%m%d') as dataEndTime,
-                 st.area_code AS areaCode
+                 st.area_code AS areaCode,
+               (select count(su.id) from
+                    esua_epdc_admin.sys_user su
+                    left join esua_epdc_admin.sys_role_user sru on sru.user_id = su.id
+                    where su.dept_id = st.id and sru.role_id = '1215214913362874370')
+                    +
+             (select count(su.id) from
+                    esua_epdc_admin.sys_user su
+                    left join esua_epdc_admin.sys_role_user sru on sru.user_id = su.id
+                    left join esua_epdc_admin.sys_dept grid on grid.id = su.dept_id and grid.del_flag='0'
+                    left join esua_epdc_admin.sys_dept community on community.id = grid.pid and community.del_flag='0'
+                    left join esua_epdc_admin.sys_dept street on street.id = community.pid and street.del_flag='0'
+                    where  sru.role_id = '1215214913362874370' and street.id = st.id group by street.id)as gridMemberTotal
+
     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 co.id=gr.pid
@@ -480,7 +510,20 @@ union all
                  SUM(IFNULL(t.topicTotal,0)) AS topicTotal,
                  SUM(IFNULL(t.projectTotal,0)) as projectTotal, 0 as companyTotal,
                 DATE_FORMAT(now(),'%Y%m%d') as dataEndTime,
-                 city.area_code AS areaCode
+                 city.area_code AS areaCode,
+     (select count(su.id) from
+                        esua_epdc_admin.sys_user su
+                        left join esua_epdc_admin.sys_role_user sru on sru.user_id = su.id
+                        where su.dept_id = city.id and sru.role_id = '1215214913362874370')
+                    +
+             (select count(su.id) from
+                    esua_epdc_admin.sys_user su
+                    left join esua_epdc_admin.sys_role_user sru on sru.user_id = su.id
+                    left join esua_epdc_admin.sys_dept grid on grid.id = su.dept_id and grid.del_flag='0'
+                    left join esua_epdc_admin.sys_dept community on community.id = grid.pid and community.del_flag='0'
+                    left join esua_epdc_admin.sys_dept street on street.id = community.pid and street.del_flag='0'
+                    left join esua_epdc_admin.sys_dept city2 on city2.id = street.pid and city2.del_flag='0'
+                    where  sru.role_id = '1215214913362874370' and city.id = city2.id group by city2.id)as gridMemberTotal
     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
@@ -602,7 +645,7 @@ union all
             FROM `esua_epdc_admin`.`sys_dept_config` t
             WHERE t.`del_flag`= 0)
                     and city.type_key='district_party' and city.party_code='shibei'
-        GROUP BY city.id
+        GROUP BY city.id;
     </select>
     <!-- 001 -->
     <select id="cpcbasedata" resultType="com.elink.esua.epdc.dto.screen.result.CpcbasedataResultDTO">