From d81ddc6b951c870dc75fcfefb1715a4b55f0c955 Mon Sep 17 00:00:00 2001
From: Jackwang <wt373747285@163.com>
Date: Fri, 28 Aug 2020 19:08:53 +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=BB=BA=E5=BC=95=E9=A2=86-?=
 =?UTF-8?q?=E5=85=88=E9=94=8B=E6=A8=A1=E8=8C=83=E6=95=B0=E6=8D=AE=E9=80=BB?=
 =?UTF-8?q?=E8=BE=91=E8=B0=83=E6=95=B4=E3=80=91-=EF=BC=88=E7=8E=8B?=
 =?UTF-8?q?=E7=AB=A5=EF=BC=89-2020/8/28?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mapper/screen/DataStatsScreencollDao.xml  | 429 ++++++++----------
 1 file changed, 185 insertions(+), 244 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 569d5c896..530efd2d3 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
@@ -516,7 +516,6 @@
 
     </select>
     <select id="pioneerdata" resultType="com.elink.esua.epdc.dto.screen.result.PioneerdataResultDTO">
-
             SELECT gr.id as orgId,
                  gr.name as orgName,
                  gr.pid as parentId,
@@ -547,73 +546,58 @@
                          sum(total.publishResolvedProjectTotal) as publishResolvedProjectTotal -- 党员已解决项目总数
             from
             (select GRID_ID,
-                            count(ei.id) as issueSum,
-                            count(eu.PARTY_FLAG = 1 OR NULL) as publishIssueSum,
-                            0 as issueTotal,
-                            0 as publishIssueTotal,
+                            sum(USER_PUBLISH_TIMES+PARTY_PUBLISH_TIMES) as issueSum,
+                            sum(PARTY_PUBLISH_TIMES) as publishIssueSum,
+                            sum(USER_PUBLISH_TIMES +
+                                    USER_LIKE_TIME +
+                                    USER_OPPOSE_TIMES +
+                                    USER_COMMENT_TIMES +
+                                    USER_TOITEM_TIMES +
+                                    USER_FINISH_TIMES +
+                                    USER_EVALUATE_TIMES +
+                                    USER_GOOD_TIMES +
+                                    PARTY_PUBLISH_TIMES +
+                                    PARTY_LIKE_TIME +
+                                    PARTY_OPPOSE_TIMES +
+                                    PARTY_COMMENT_TIMES +
+                                    PARTY_TOITEM_TIMES +
+                                    PARTY_FINISH_TIMES +
+                                    PARTY_EVALUATE_TIMES +
+                                    PARTY_GOOD_TIMES) as issueTotal,
+                            sum(PARTY_PUBLISH_TIMES +
+                                    PARTY_LIKE_TIME +
+                                    PARTY_OPPOSE_TIMES +
+                                    PARTY_COMMENT_TIMES +
+                                    PARTY_TOITEM_TIMES +
+                                    PARTY_FINISH_TIMES +
+                                    PARTY_EVALUATE_TIMES +
+                                    PARTY_GOOD_TIMES) as publishIssueTotal,
                             0 as topicTotal,
                             0 as publishTopicTotal,
-                            0 as shiftProjectTotal,
-                            0 as publishShiftProjectTotal,
-                            0 as resolvedProjectTotal,
-                            0 as publishResolvedProjectTotal
-                from esua_epdc_events.epdc_issue ei
-                left join esua_epdc_user.epdc_user eu on eu.id=ei.USER_ID
-                where ei.DEL_FLAG=0 and eu.DEL_FLAG=0
-                group by ei.GRID_ID
+                            sum(USER_TOITEM_TIMES+PARTY_TOITEM_TIMES) as shiftProjectTotal,
+                            sum(PARTY_TOITEM_TIMES) as publishShiftProjectTotal,
+                            sum(USER_FINISH_TIMES+PARTY_FINISH_TIMES) as resolvedProjectTotal,
+                            sum(PARTY_FINISH_TIMES) as publishResolvedProjectTotal
+                from esua_epdc_analysis.epdc_dept_event_person_time ed
+                where GRID_ID is not null
+                group by ed.GRID_ID
 
     UNION ALL
-            select  GRID_ID,
-                            0 as issueSum,
-                            0 as publishIssueSum,
-                            count(ee.id) as issueTotal,
-                            count(eu.PARTY_FLAG = 1 OR NULL) as publishIssueTotal,
-                            0 as topicTotal,
-                            0 as publishTopicTotal,
-                            0 as shiftProjectTotal,
-                            0 as publishShiftProjectTotal,
-                            0 as resolvedProjectTotal,
-                            0 as publishResolvedProjectTotal
-                from esua_epdc_events.epdc_events ee
-                left join esua_epdc_user.epdc_user eu on eu.id=ee.USER_ID
-                where ee.DEL_FLAG=0 and eu.DEL_FLAG=0
-                group by ee.GRID_ID
-
-        UNION ALL
 
             select GRID_ID,
                             0 as issueSum,
                             0 as publishIssueSum,
                             0 as issueTotal,
                             0 as publishIssueTotal,
-                            count(et.id) as topicTotal,
-                            count(eu.PARTY_FLAG = 1 OR NULL) as publishTopicTotal,
+                            sum(TOPIC_PUBLISH_TIMES) as topicTotal,
+                            sum(PARTY_PUBLISH_TIMES) as publishTopicTotal,
                             0 as shiftProjectTotal,
                             0 as publishShiftProjectTotal,
                             0 as resolvedProjectTotal,
                             0 as publishResolvedProjectTotal
-                from esua_epdc_group.epdc_topic et
-                left join esua_epdc_user.epdc_user eu on eu.id=et.USER_ID
-                where et.DEL_FLAG=0 and eu.DEL_FLAG=0
-                group by GRID_ID
-
-        UNION ALL
-
-        select GRID_ID,
-                        0 as issueSum,
-                        0 as publishIssueSum,
-                        0 as issueTotal,
-                        0 as publishIssueTotal,
-                        0 as topicTotal,
-                        0 as publishTopicTotal,
-                        count(ei.id) as shiftProjectTotal,
-                        count(eu.PARTY_FLAG = 1 or null) as publishShiftProjectTotal,
-                        count(ITEM_STATE = 10 OR NULL) as resolvedProjectTotal,
-                        count((ITEM_STATE = 10 and eu.PARTY_FLAG = 1) OR NULL) as publishResolvedProjectTotal
-            from esua_epdc_events.epdc_item ei
-            left join esua_epdc_user.epdc_user eu on eu.id=ei.USER_ID
-            where ei.DEL_FLAG=0 and eu.DEL_FLAG=0
-            group by GRID_ID)total
+                from esua_epdc_analysis.epdc_dept_group_person_time ed
+                where GRID_ID is not null
+                group by ed.GRID_ID)total
         group by    total.GRID_ID)t on gr.id=t.GRID_ID
         where gr.del_flag=0
                     and gr.type_key='grid_party'
@@ -628,16 +612,16 @@ UNION ALL
                  co.name as orgName,
                  co.pid as parentId,
                 'agency' as orgType,
-                 IFNULL(t.publishIssueSum,0) AS publishIssueTotal, -- 党员发布的议题总数
-                 IFNULL(t.issueTotal,0) AS issueTotal, -- 议事总数
-                 IFNULL(t.topicTotal,0) AS topicTotal, -- 话题总数
-                 IFNULL(t.shiftProjectTotal,0) AS shiftProjectTotal, -- 议题转项目数
-                 IFNULL(t.resolvedProjectTotal,0) AS resolvedProjectTotal, -- 已解决项目总数
-                 IFNULL(format(round(publishIssueTotal/issueTotal,4)*100,2),0.00) as issueRatio, -- 议事占比(党员/用户)
-                 IFNULL(format(round(publishTopicTotal/topicTotal,4)*100,2),0.00) as topicRatio, -- 话题占比(党员/用户)
-                 IFNULL(format(round(publishShiftProjectTotal/shiftProjectTotal,4)*100,2),0.00) as shiftProjectRatio, -- 议题转项目占比(党员/用户)
-                 IFNULL(format(round(publishResolvedProjectTotal/resolvedProjectTotal,4)*100,2),0.00) as resolvedProjectRatio, -- 解决项目占比(党员/用户)
-                 IFNULL(format(round(publishIssueSum/issueSum,4)*100,2),0.00) as publishIssueRatio, -- 党员发布议题占比(党员/用户)
+                 SUM(IFNULL(t.publishIssueSum,0)) AS publishIssueTotal, -- 党员发布的议题总数
+                 SUM(IFNULL(t.publishIssueTotal,0)) AS issueTotal, -- 议事总数
+                 SUM(IFNULL(t.publishTopicTotal,0)) AS topicTotal, -- 话题总数
+                 SUM(IFNULL(t.shiftProjectTotal,0)) AS shiftProjectTotal, -- 议题转项目数
+                 SUM(IFNULL(t.resolvedProjectTotal,0)) AS resolvedProjectTotal, -- 已解决项目总数
+                 IFNULL(format(round(SUM(IFNULL(publishIssueTotal,0))/SUM(IFNULL(issueTotal,0)),4)*100,2),0.00) as issueRatio, -- 议事占比(党员/用户)
+                 IFNULL(format(round(SUM(IFNULL(publishTopicTotal,0))/SUM(IFNULL(topicTotal,0)),4)*100,2),0.00) as topicRatio, -- 话题占比(党员/用户)
+                 IFNULL(format(round(SUM(IFNULL(publishShiftProjectTotal,0))/SUM(IFNULL(shiftProjectTotal,0)),4)*100,2),0.00) as shiftProjectRatio, -- 议题转项目占比(党员/用户)
+                 IFNULL(format(round(SUM(IFNULL(publishResolvedProjectTotal,0))/SUM(IFNULL(resolvedProjectTotal,0)),4)*100,2),0.00) as resolvedProjectRatio, -- 解决项目占比(党员/用户)
+                 IFNULL(format(round(SUM(IFNULL(publishIssueSum,0))/SUM(IFNULL(issueSum,0)),4)*100,2),0.00) as publishIssueRatio, -- 党员发布议题占比(党员/用户)
                  DATE_FORMAT(now(),'%Y%m%d') as dataEndTime
     FROM esua_epdc_admin.sys_dept co
     LEFT JOIN esua_epdc_admin.sys_dept gr on co.id=gr.pid
@@ -655,73 +639,58 @@ UNION ALL
                          sum(total.publishResolvedProjectTotal) as publishResolvedProjectTotal -- 党员已解决项目总数
             from
             (select GRID_ID,
-                            count(ei.id) as issueSum,
-                            count(eu.PARTY_FLAG = 1 OR NULL) as publishIssueSum,
-                            0 as issueTotal,
-                            0 as publishIssueTotal,
+                            sum(USER_PUBLISH_TIMES+PARTY_PUBLISH_TIMES) as issueSum,
+                            sum(PARTY_PUBLISH_TIMES) as publishIssueSum,
+                            sum(USER_PUBLISH_TIMES +
+                                    USER_LIKE_TIME +
+                                    USER_OPPOSE_TIMES +
+                                    USER_COMMENT_TIMES +
+                                    USER_TOITEM_TIMES +
+                                    USER_FINISH_TIMES +
+                                    USER_EVALUATE_TIMES +
+                                    USER_GOOD_TIMES +
+                                    PARTY_PUBLISH_TIMES +
+                                    PARTY_LIKE_TIME +
+                                    PARTY_OPPOSE_TIMES +
+                                    PARTY_COMMENT_TIMES +
+                                    PARTY_TOITEM_TIMES +
+                                    PARTY_FINISH_TIMES +
+                                    PARTY_EVALUATE_TIMES +
+                                    PARTY_GOOD_TIMES) as issueTotal,
+                            sum(PARTY_PUBLISH_TIMES +
+                                    PARTY_LIKE_TIME +
+                                    PARTY_OPPOSE_TIMES +
+                                    PARTY_COMMENT_TIMES +
+                                    PARTY_TOITEM_TIMES +
+                                    PARTY_FINISH_TIMES +
+                                    PARTY_EVALUATE_TIMES +
+                                    PARTY_GOOD_TIMES) as publishIssueTotal,
                             0 as topicTotal,
                             0 as publishTopicTotal,
-                            0 as shiftProjectTotal,
-                            0 as publishShiftProjectTotal,
-                            0 as resolvedProjectTotal,
-                            0 as publishResolvedProjectTotal
-                from esua_epdc_events.epdc_issue ei
-                left join esua_epdc_user.epdc_user eu on eu.id=ei.USER_ID
-                where ei.DEL_FLAG=0 and eu.DEL_FLAG=0
-                group by ei.GRID_ID
+                            sum(USER_TOITEM_TIMES+PARTY_TOITEM_TIMES) as shiftProjectTotal,
+                            sum(PARTY_TOITEM_TIMES) as publishShiftProjectTotal,
+                            sum(USER_FINISH_TIMES+PARTY_FINISH_TIMES) as resolvedProjectTotal,
+                            sum(PARTY_FINISH_TIMES) as publishResolvedProjectTotal
+                from esua_epdc_analysis.epdc_dept_event_person_time ed
+                where GRID_ID is not null
+                group by ed.GRID_ID
 
     UNION ALL
-            select  GRID_ID,
-                            0 as issueSum,
-                            0 as publishIssueSum,
-                            count(ee.id) as issueTotal,
-                            count(eu.PARTY_FLAG = 1 OR NULL) as publishIssueTotal,
-                            0 as topicTotal,
-                            0 as publishTopicTotal,
-                            0 as shiftProjectTotal,
-                            0 as publishShiftProjectTotal,
-                            0 as resolvedProjectTotal,
-                            0 as publishResolvedProjectTotal
-                from esua_epdc_events.epdc_events ee
-                left join esua_epdc_user.epdc_user eu on eu.id=ee.USER_ID
-                where ee.DEL_FLAG=0 and eu.DEL_FLAG=0
-                group by ee.GRID_ID
-
-        UNION ALL
 
             select GRID_ID,
                             0 as issueSum,
                             0 as publishIssueSum,
                             0 as issueTotal,
                             0 as publishIssueTotal,
-                            count(et.id) as topicTotal,
-                            count(eu.PARTY_FLAG = 1 OR NULL) as publishTopicTotal,
+                            sum(TOPIC_PUBLISH_TIMES) as topicTotal,
+                            sum(PARTY_PUBLISH_TIMES) as publishTopicTotal,
                             0 as shiftProjectTotal,
                             0 as publishShiftProjectTotal,
                             0 as resolvedProjectTotal,
                             0 as publishResolvedProjectTotal
-                from esua_epdc_group.epdc_topic et
-                left join esua_epdc_user.epdc_user eu on eu.id=et.USER_ID
-                where et.DEL_FLAG=0 and eu.DEL_FLAG=0
-                group by GRID_ID
-
-        UNION ALL
-
-        select GRID_ID,
-                        0 as issueSum,
-                        0 as publishIssueSum,
-                        0 as issueTotal,
-                        0 as publishIssueTotal,
-                        0 as topicTotal,
-                        0 as publishTopicTotal,
-                        count(ei.id) as shiftProjectTotal,
-                        count(eu.PARTY_FLAG = 1 or null) as publishShiftProjectTotal,
-                        count(ITEM_STATE = 10 OR NULL) as resolvedProjectTotal,
-                        count((ITEM_STATE = 10 and eu.PARTY_FLAG = 1) OR NULL) as publishResolvedProjectTotal
-            from esua_epdc_events.epdc_item ei
-            left join esua_epdc_user.epdc_user eu on eu.id=ei.USER_ID
-            where ei.DEL_FLAG=0 and eu.DEL_FLAG=0
-            group by GRID_ID)total
+                from esua_epdc_analysis.epdc_dept_group_person_time ed
+                where GRID_ID is not null
+                group by ed.GRID_ID)total
         group by    total.GRID_ID)t on gr.id=t.GRID_ID
         where gr.del_flag=0
                     and co.del_flag=0
@@ -737,16 +706,16 @@ union all
                  st.name as orgName,
                  st.pid as parentId,
                 'agency' as orgType,
-                 IFNULL(t.publishIssueSum,0) AS publishIssueTotal, -- 党员发布的议题总数
-                 IFNULL(t.issueTotal,0) AS issueTotal, -- 议事总数
-                 IFNULL(t.topicTotal,0) AS topicTotal, -- 话题总数
-                 IFNULL(t.shiftProjectTotal,0) AS shiftProjectTotal, -- 议题转项目数
-                 IFNULL(t.resolvedProjectTotal,0) AS resolvedProjectTotal, -- 已解决项目总数
-                 IFNULL(format(round(publishIssueTotal/issueTotal,4)*100,2),0.00) as issueRatio, -- 议事占比(党员/用户)
-                 IFNULL(format(round(publishTopicTotal/topicTotal,4)*100,2),0.00) as topicRatio, -- 话题占比(党员/用户)
-                 IFNULL(format(round(publishShiftProjectTotal/shiftProjectTotal,4)*100,2),0.00) as shiftProjectRatio, -- 议题转项目占比(党员/用户)
-                 IFNULL(format(round(publishResolvedProjectTotal/resolvedProjectTotal,4)*100,2),0.00) as resolvedProjectRatio, -- 解决项目占比(党员/用户)
-                 IFNULL(format(round(publishIssueSum/issueSum,4)*100,2),0.00) as publishIssueRatio, -- 党员发布议题占比(党员/用户)
+                 SUM(IFNULL(t.publishIssueSum,0)) AS publishIssueTotal, -- 党员发布的议题总数
+                 SUM(IFNULL(t.publishIssueTotal,0)) AS issueTotal, -- 议事总数
+                 SUM(IFNULL(t.publishTopicTotal,0)) AS topicTotal, -- 话题总数
+                 SUM(IFNULL(t.shiftProjectTotal,0)) AS shiftProjectTotal, -- 议题转项目数
+                 SUM(IFNULL(t.resolvedProjectTotal,0)) AS resolvedProjectTotal, -- 已解决项目总数
+                 IFNULL(format(round(SUM(IFNULL(publishIssueTotal,0))/SUM(IFNULL(issueTotal,0)),4)*100,2),0.00) as issueRatio, -- 议事占比(党员/用户)
+                 IFNULL(format(round(SUM(IFNULL(publishTopicTotal,0))/SUM(IFNULL(topicTotal,0)),4)*100,2),0.00) as topicRatio, -- 话题占比(党员/用户)
+                 IFNULL(format(round(SUM(IFNULL(publishShiftProjectTotal,0))/SUM(IFNULL(shiftProjectTotal,0)),4)*100,2),0.00) as shiftProjectRatio, -- 议题转项目占比(党员/用户)
+                 IFNULL(format(round(SUM(IFNULL(publishResolvedProjectTotal,0))/SUM(IFNULL(resolvedProjectTotal,0)),4)*100,2),0.00) as resolvedProjectRatio, -- 解决项目占比(党员/用户)
+                 IFNULL(format(round(SUM(IFNULL(publishIssueSum,0))/SUM(IFNULL(issueSum,0)),4)*100,2),0.00) as publishIssueRatio, -- 党员发布议题占比(党员/用户)
                  DATE_FORMAT(now(),'%Y%m%d') as dataEndTime
     FROM esua_epdc_admin.sys_dept st
     left join esua_epdc_admin.sys_dept co on co.pid=st.id
@@ -765,73 +734,58 @@ union all
                          sum(total.publishResolvedProjectTotal) as publishResolvedProjectTotal -- 党员已解决项目总数
             from
             (select GRID_ID,
-                            count(ei.id) as issueSum,
-                            count(eu.PARTY_FLAG = 1 OR NULL) as publishIssueSum,
-                            0 as issueTotal,
-                            0 as publishIssueTotal,
+                            sum(USER_PUBLISH_TIMES+PARTY_PUBLISH_TIMES) as issueSum,
+                            sum(PARTY_PUBLISH_TIMES) as publishIssueSum,
+                            sum(USER_PUBLISH_TIMES +
+                                    USER_LIKE_TIME +
+                                    USER_OPPOSE_TIMES +
+                                    USER_COMMENT_TIMES +
+                                    USER_TOITEM_TIMES +
+                                    USER_FINISH_TIMES +
+                                    USER_EVALUATE_TIMES +
+                                    USER_GOOD_TIMES +
+                                    PARTY_PUBLISH_TIMES +
+                                    PARTY_LIKE_TIME +
+                                    PARTY_OPPOSE_TIMES +
+                                    PARTY_COMMENT_TIMES +
+                                    PARTY_TOITEM_TIMES +
+                                    PARTY_FINISH_TIMES +
+                                    PARTY_EVALUATE_TIMES +
+                                    PARTY_GOOD_TIMES) as issueTotal,
+                            sum(PARTY_PUBLISH_TIMES +
+                                    PARTY_LIKE_TIME +
+                                    PARTY_OPPOSE_TIMES +
+                                    PARTY_COMMENT_TIMES +
+                                    PARTY_TOITEM_TIMES +
+                                    PARTY_FINISH_TIMES +
+                                    PARTY_EVALUATE_TIMES +
+                                    PARTY_GOOD_TIMES) as publishIssueTotal,
                             0 as topicTotal,
                             0 as publishTopicTotal,
-                            0 as shiftProjectTotal,
-                            0 as publishShiftProjectTotal,
-                            0 as resolvedProjectTotal,
-                            0 as publishResolvedProjectTotal
-                from esua_epdc_events.epdc_issue ei
-                left join esua_epdc_user.epdc_user eu on eu.id=ei.USER_ID
-                where ei.DEL_FLAG=0 and eu.DEL_FLAG=0
-                group by ei.GRID_ID
+                            sum(USER_TOITEM_TIMES+PARTY_TOITEM_TIMES) as shiftProjectTotal,
+                            sum(PARTY_TOITEM_TIMES) as publishShiftProjectTotal,
+                            sum(USER_FINISH_TIMES+PARTY_FINISH_TIMES) as resolvedProjectTotal,
+                            sum(PARTY_FINISH_TIMES) as publishResolvedProjectTotal
+                from esua_epdc_analysis.epdc_dept_event_person_time ed
+                where GRID_ID is not null
+                group by ed.GRID_ID
 
     UNION ALL
-            select  GRID_ID,
-                            0 as issueSum,
-                            0 as publishIssueSum,
-                            count(ee.id) as issueTotal,
-                            count(eu.PARTY_FLAG = 1 OR NULL) as publishIssueTotal,
-                            0 as topicTotal,
-                            0 as publishTopicTotal,
-                            0 as shiftProjectTotal,
-                            0 as publishShiftProjectTotal,
-                            0 as resolvedProjectTotal,
-                            0 as publishResolvedProjectTotal
-                from esua_epdc_events.epdc_events ee
-                left join esua_epdc_user.epdc_user eu on eu.id=ee.USER_ID
-                where ee.DEL_FLAG=0 and eu.DEL_FLAG=0
-                group by ee.GRID_ID
-
-        UNION ALL
 
             select GRID_ID,
                             0 as issueSum,
                             0 as publishIssueSum,
                             0 as issueTotal,
                             0 as publishIssueTotal,
-                            count(et.id) as topicTotal,
-                            count(eu.PARTY_FLAG = 1 OR NULL) as publishTopicTotal,
+                            sum(TOPIC_PUBLISH_TIMES) as topicTotal,
+                            sum(PARTY_PUBLISH_TIMES) as publishTopicTotal,
                             0 as shiftProjectTotal,
                             0 as publishShiftProjectTotal,
                             0 as resolvedProjectTotal,
                             0 as publishResolvedProjectTotal
-                from esua_epdc_group.epdc_topic et
-                left join esua_epdc_user.epdc_user eu on eu.id=et.USER_ID
-                where et.DEL_FLAG=0 and eu.DEL_FLAG=0
-                group by GRID_ID
-
-        UNION ALL
-
-        select GRID_ID,
-                        0 as issueSum,
-                        0 as publishIssueSum,
-                        0 as issueTotal,
-                        0 as publishIssueTotal,
-                        0 as topicTotal,
-                        0 as publishTopicTotal,
-                        count(ei.id) as shiftProjectTotal,
-                        count(eu.PARTY_FLAG = 1 or null) as publishShiftProjectTotal,
-                        count(ITEM_STATE = 10 OR NULL) as resolvedProjectTotal,
-                        count((ITEM_STATE = 10 and eu.PARTY_FLAG = 1) OR NULL) as publishResolvedProjectTotal
-            from esua_epdc_events.epdc_item ei
-            left join esua_epdc_user.epdc_user eu on eu.id=ei.USER_ID
-            where ei.DEL_FLAG=0 and eu.DEL_FLAG=0
-            group by GRID_ID)total
+                from esua_epdc_analysis.epdc_dept_group_person_time ed
+                where GRID_ID is not null
+                group by ed.GRID_ID)total
         group by    total.GRID_ID)t on gr.id=t.GRID_ID
         where gr.del_flag=0
                     and co.del_flag=0
@@ -848,16 +802,16 @@ union all
                  city.name as orgName,
                  city.pid as parentId,
                 'agency' as orgType,
-                 IFNULL(t.publishIssueSum,0) AS publishIssueTotal, -- 党员发布的议题总数
-                 IFNULL(t.issueTotal,0) AS issueTotal, -- 议事总数
-                 IFNULL(t.topicTotal,0) AS topicTotal, -- 话题总数
-                 IFNULL(t.shiftProjectTotal,0) AS shiftProjectTotal, -- 议题转项目数
-                 IFNULL(t.resolvedProjectTotal,0) AS resolvedProjectTotal, -- 已解决项目总数
-                 IFNULL(format(round(publishIssueTotal/issueTotal,4)*100,2),0.00) as issueRatio, -- 议事占比(党员/用户)
-                 IFNULL(format(round(publishTopicTotal/topicTotal,4)*100,2),0.00) as topicRatio, -- 话题占比(党员/用户)
-                 IFNULL(format(round(publishShiftProjectTotal/shiftProjectTotal,4)*100,2),0.00) as shiftProjectRatio, -- 议题转项目占比(党员/用户)
-                 IFNULL(format(round(publishResolvedProjectTotal/resolvedProjectTotal,4)*100,2),0.00) as resolvedProjectRatio, -- 解决项目占比(党员/用户)
-                 IFNULL(format(round(publishIssueSum/issueSum,4)*100,2),0.00) as publishIssueRatio, -- 党员发布议题占比(党员/用户)
+                 SUM(IFNULL(t.publishIssueSum,0)) AS publishIssueTotal, -- 党员发布的议题总数
+                 SUM(IFNULL(t.publishIssueTotal,0)) AS issueTotal, -- 议事总数
+                 SUM(IFNULL(t.publishTopicTotal,0)) AS topicTotal, -- 话题总数
+                 SUM(IFNULL(t.shiftProjectTotal,0)) AS shiftProjectTotal, -- 议题转项目数
+                 SUM(IFNULL(t.resolvedProjectTotal,0)) AS resolvedProjectTotal, -- 已解决项目总数
+                 IFNULL(format(round(SUM(IFNULL(publishIssueTotal,0))/SUM(IFNULL(issueTotal,0)),4)*100,2),0.00) as issueRatio, -- 议事占比(党员/用户)
+                 IFNULL(format(round(SUM(IFNULL(publishTopicTotal,0))/SUM(IFNULL(topicTotal,0)),4)*100,2),0.00) as topicRatio, -- 话题占比(党员/用户)
+                 IFNULL(format(round(SUM(IFNULL(publishShiftProjectTotal,0))/SUM(IFNULL(shiftProjectTotal,0)),4)*100,2),0.00) as shiftProjectRatio, -- 议题转项目占比(党员/用户)
+                 IFNULL(format(round(SUM(IFNULL(publishResolvedProjectTotal,0))/SUM(IFNULL(resolvedProjectTotal,0)),4)*100,2),0.00) as resolvedProjectRatio, -- 解决项目占比(党员/用户)
+                 IFNULL(format(round(SUM(IFNULL(publishIssueSum,0))/SUM(IFNULL(issueSum,0)),4)*100,2),0.00) as publishIssueRatio, -- 党员发布议题占比(党员/用户)
                  DATE_FORMAT(now(),'%Y%m%d') as dataEndTime
     FROM esua_epdc_admin.sys_dept city
     left join esua_epdc_admin.sys_dept st on st.pid=city.id
@@ -877,81 +831,68 @@ union all
                          sum(total.publishResolvedProjectTotal) as publishResolvedProjectTotal -- 党员已解决项目总数
             from
             (select GRID_ID,
-                            count(ei.id) as issueSum,
-                            count(eu.PARTY_FLAG = 1 OR NULL) as publishIssueSum,
-                            0 as issueTotal,
-                            0 as publishIssueTotal,
+                            sum(USER_PUBLISH_TIMES+PARTY_PUBLISH_TIMES) as issueSum,
+                            sum(PARTY_PUBLISH_TIMES) as publishIssueSum,
+                            sum(USER_PUBLISH_TIMES +
+                                    USER_LIKE_TIME +
+                                    USER_OPPOSE_TIMES +
+                                    USER_COMMENT_TIMES +
+                                    USER_TOITEM_TIMES +
+                                    USER_FINISH_TIMES +
+                                    USER_EVALUATE_TIMES +
+                                    USER_GOOD_TIMES +
+                                    PARTY_PUBLISH_TIMES +
+                                    PARTY_LIKE_TIME +
+                                    PARTY_OPPOSE_TIMES +
+                                    PARTY_COMMENT_TIMES +
+                                    PARTY_TOITEM_TIMES +
+                                    PARTY_FINISH_TIMES +
+                                    PARTY_EVALUATE_TIMES +
+                                    PARTY_GOOD_TIMES) as issueTotal,
+                            sum(PARTY_PUBLISH_TIMES +
+                                    PARTY_LIKE_TIME +
+                                    PARTY_OPPOSE_TIMES +
+                                    PARTY_COMMENT_TIMES +
+                                    PARTY_TOITEM_TIMES +
+                                    PARTY_FINISH_TIMES +
+                                    PARTY_EVALUATE_TIMES +
+                                    PARTY_GOOD_TIMES) as publishIssueTotal,
                             0 as topicTotal,
                             0 as publishTopicTotal,
-                            0 as shiftProjectTotal,
-                            0 as publishShiftProjectTotal,
-                            0 as resolvedProjectTotal,
-                            0 as publishResolvedProjectTotal
-                from esua_epdc_events.epdc_issue ei
-                left join esua_epdc_user.epdc_user eu on eu.id=ei.USER_ID
-                where ei.DEL_FLAG=0 and eu.DEL_FLAG=0
-                group by ei.GRID_ID
+                            sum(USER_TOITEM_TIMES+PARTY_TOITEM_TIMES) as shiftProjectTotal,
+                            sum(PARTY_TOITEM_TIMES) as publishShiftProjectTotal,
+                            sum(USER_FINISH_TIMES+PARTY_FINISH_TIMES) as resolvedProjectTotal,
+                            sum(PARTY_FINISH_TIMES) as publishResolvedProjectTotal
+                from esua_epdc_analysis.epdc_dept_event_person_time ed
+                where GRID_ID is not null
+                group by ed.GRID_ID
 
     UNION ALL
-            select  GRID_ID,
-                            0 as issueSum,
-                            0 as publishIssueSum,
-                            count(ee.id) as issueTotal,
-                            count(eu.PARTY_FLAG = 1 OR NULL) as publishIssueTotal,
-                            0 as topicTotal,
-                            0 as publishTopicTotal,
-                            0 as shiftProjectTotal,
-                            0 as publishShiftProjectTotal,
-                            0 as resolvedProjectTotal,
-                            0 as publishResolvedProjectTotal
-                from esua_epdc_events.epdc_events ee
-                left join esua_epdc_user.epdc_user eu on eu.id=ee.USER_ID
-                where ee.DEL_FLAG=0 and eu.DEL_FLAG=0
-                group by ee.GRID_ID
-
-        UNION ALL
 
             select GRID_ID,
                             0 as issueSum,
                             0 as publishIssueSum,
                             0 as issueTotal,
                             0 as publishIssueTotal,
-                            count(et.id) as topicTotal,
-                            count(eu.PARTY_FLAG = 1 OR NULL) as publishTopicTotal,
+                            sum(TOPIC_PUBLISH_TIMES) as topicTotal,
+                            sum(PARTY_PUBLISH_TIMES) as publishTopicTotal,
                             0 as shiftProjectTotal,
                             0 as publishShiftProjectTotal,
                             0 as resolvedProjectTotal,
                             0 as publishResolvedProjectTotal
-                from esua_epdc_group.epdc_topic et
-                left join esua_epdc_user.epdc_user eu on eu.id=et.USER_ID
-                where et.DEL_FLAG=0 and eu.DEL_FLAG=0
-                group by GRID_ID
-
-        UNION ALL
-
-        select GRID_ID,
-                        0 as issueSum,
-                        0 as publishIssueSum,
-                        0 as issueTotal,
-                        0 as publishIssueTotal,
-                        0 as topicTotal,
-                        0 as publishTopicTotal,
-                        count(ei.id) as shiftProjectTotal,
-                        count(eu.PARTY_FLAG = 1 or null) as publishShiftProjectTotal,
-                        count(ITEM_STATE = 10 OR NULL) as resolvedProjectTotal,
-                        count((ITEM_STATE = 10 and eu.PARTY_FLAG = 1) OR NULL) as publishResolvedProjectTotal
-            from esua_epdc_events.epdc_item ei
-            left join esua_epdc_user.epdc_user eu on eu.id=ei.USER_ID
-            where ei.DEL_FLAG=0 and eu.DEL_FLAG=0
-            group by GRID_ID)total
+                from esua_epdc_analysis.epdc_dept_group_person_time ed
+                where GRID_ID is not null
+                group by ed.GRID_ID)total
         group by    total.GRID_ID)t on gr.id=t.GRID_ID
         where gr.del_flag=0
                     and co.del_flag=0
                     and st.del_flag=0
                     and city.DEL_FLAG=0
+                                        and gr.id not in ('1191534129122230274','1191534416067149825','1191535301279203329','1191535501527859202',
+'1191535697380884481','1192004624745586689','1230704850994528257',
+'1201319745506598913','1201687651826360321','1201689212329746433')
                     and city.type_key='district_party' and city.party_code='shibei'
         GROUP BY city.id
-
     </select>
     <select id="usertotaldata" resultType="com.elink.esua.epdc.dto.screen.result.UsertotaldataResultDTO">