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 ed540bb8a..080678e83 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
@@ -19,7 +19,7 @@
                 SUM( total.ageLevel4 ) AS ageLevel4,
                 SUM( total.ageLevel5 ) AS ageLevel5,
                 SUM( total.ageLevel6 ) AS ageLevel6,
-                DATE_FORMAT(now(),'%Y-%m-%d') as dataEndTime
+                DATE_FORMAT(now(),'%Y%m%d') as dataEndTime
             FROM
                 (SELECT
                         t1.orgId,
@@ -91,7 +91,7 @@
                 SUM( total.ageLevel4 ) AS ageLevel4,
                 SUM( total.ageLevel5 ) AS ageLevel5,
                 SUM( total.ageLevel6 ) AS ageLevel6,
-                DATE_FORMAT(now(),'%Y-%m-%d') as dataEndTime
+                DATE_FORMAT(now(),'%Y%m%d') as dataEndTime
             FROM
                 (SELECT
                         t1.orgId,
@@ -165,7 +165,7 @@
                 SUM( total.ageLevel4 ) AS ageLevel4,
                 SUM( total.ageLevel5 ) AS ageLevel5,
                 SUM( total.ageLevel6 ) AS ageLevel6,
-                DATE_FORMAT(now(),'%Y-%m-%d') as dataEndTime
+                DATE_FORMAT(now(),'%Y%m%d') as dataEndTime
             FROM
                 (SELECT
                         t1.orgId,
@@ -242,7 +242,7 @@
                 SUM( total.ageLevel4 ) AS ageLevel4,
                 SUM( total.ageLevel5 ) AS ageLevel5,
                 SUM( total.ageLevel6 ) AS ageLevel6,
-                DATE_FORMAT(now(),'%Y-%m-%d') as dataEndTime
+                DATE_FORMAT(now(),'%Y%m%d') as dataEndTime
             FROM
                 (SELECT
                         t1.orgId,
@@ -359,10 +359,20 @@
 							WHEN ei.ITEM_STATE='5' THEN '已关闭'
 							WHEN ei.ITEM_STATE='10' THEN '已结案'END) as eventStatusDesc,
 				(select CASE WHEN eih.STATE =  0 THEN '处理中'
-										 WHEN eih.STATE =  5 THEN '已关闭'
-										 WHEN eih.STATE =  10 THEN '已结案' end from esua_epdc_events.epdc_item_handle_process eih
+                             WHEN eih.STATE =  5 THEN '已关闭'
+                             WHEN eih.STATE =  10 THEN '已结案'
+                             WHEN eih.STATE =  15 THEN '网格化平台-上报'
+                             WHEN eih.STATE =  20 THEN '网格化平台-受理'
+                             WHEN eih.STATE =  25 THEN '网格化平台-立案'
+                             WHEN eih.STATE =  30 THEN '网格化平台-派遣'
+                             WHEN eih.STATE =  35 THEN '网格化平台-中间再派'
+                             WHEN eih.STATE =  40 THEN '网格化平台-接单'
+                             WHEN eih.STATE =  45 THEN '网格化平台-处理'
+                             WHEN eih.STATE =  50 THEN '网格化平台-中间督办'
+                             WHEN eih.STATE =  55 THEN '网格化平台-催办'
+                             WHEN eih.STATE =  60 THEN '网格化平台-结案' end from esua_epdc_events.epdc_item_handle_process eih
 				where eih.DEL_FLAG=0 and eih.ITEM_ID=ei.ID order by CREATED_TIME desc,id limit 1) as latestOperateDesc,
-	            DATE_FORMAT(now(),'%Y-%m-%d') as dataEndTime,
+	            DATE_FORMAT(now(),'%Y%m%d') as dataEndTime,
 				d.pids as allParentIds
 
 		from esua_epdc_events.epdc_item ei
@@ -381,13 +391,14 @@
 		order by ei.CREATED_TIME desc,i.id
     </select>
     <select id="partylinkmassesdata" resultType="com.elink.esua.epdc.dto.screen.result.PartylinkmassesdataResultDTO">
+
                 select  gr.id as orgId,
-				gr.name as orgName,
-				gr.pid as parentId,
-				'grid' as orgType,
-				IFNULL(dg.createGroupTotal,0) AS createGroupTotal,
-				IFNULL(dg.groupUserTotal,0) AS groupUserTotal,
-				DATE_FORMAT(now(),'%Y-%m-%d') as dataEndTime
+                gr.name as orgName,
+                gr.pid as parentId,
+                'grid' as orgType,
+                IFNULL(dg.createGroupTotal,0) AS createGroupTotal,
+                IFNULL(dg.groupUserTotal,0) AS groupUserTotal,
+                DATE_FORMAT(now(),'%Y%m%d') as dataEndTime
             from esua_epdc_admin.sys_dept gr
             left join
                  (select  eg.GRID_ID,
@@ -402,7 +413,7 @@
                     where eg.DEL_FLAG=0 and eg.STATE=10
                     group by eg.GRID_ID)dg on dg.GRID_ID=gr.id
                 where gr.del_flag=0 and gr.type_key='grid_party'
-											and gr.id not in ('1191534129122230274','1191534416067149825','1191535301279203329','1191535501527859202',
+                                            and gr.id not in ('1191534129122230274','1191534416067149825','1191535301279203329','1191535501527859202',
 '1191535697380884481','1192004624745586689','1230704850994528257',
 '1201319745506598913','1201687651826360321','1201689212329746433')
 
@@ -414,7 +425,7 @@
                                 'agency' as orgType,
                                 sum(IFNULL(dg.createGroupTotal,0)) AS createGroupTotal,
                                 sum(IFNULL(dg.groupUserTotal,0)) AS groupUserTotal,
-				                DATE_FORMAT(now(),'%Y-%m-%d') as dataEndTime
+                                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
             left join
@@ -432,7 +443,7 @@
                 where gr.del_flag=0
                             and co.del_flag=0
                             and co.type_key='community_party'
-														and co.id not in ('1191534129122230274','1191534416067149825','1191535301279203329','1191535501527859202',
+                                                        and co.id not in ('1191534129122230274','1191534416067149825','1191535301279203329','1191535501527859202',
 '1191535697380884481','1192004624745586689','1230704850994528257',
 '1201319745506598913','1201687651826360321','1201689212329746433')
                 group by co.id
@@ -445,7 +456,7 @@
                                 'agency' as orgType,
                                 sum(IFNULL(dg.createGroupTotal,0)) AS createGroupTotal,
                                 sum(IFNULL(dg.groupUserTotal,0)) AS groupUserTotal,
-				                DATE_FORMAT(now(),'%Y-%m-%d') as dataEndTime
+                                DATE_FORMAT(now(),'%Y%m%d') as dataEndTime
             from esua_epdc_admin.sys_dept st
             left join esua_epdc_admin.sys_dept co on st.id=co.pid
             left join esua_epdc_admin.sys_dept gr on co.id=gr.pid
@@ -465,7 +476,7 @@
                             and co.del_flag=0
                             and st.del_flag=0
                             and st.type_key='street_party'
-														and st.id not in ('1191534129122230274','1191534416067149825','1191535301279203329','1191535501527859202',
+                                                        and st.id not in ('1191534129122230274','1191534416067149825','1191535301279203329','1191535501527859202',
 '1191535697380884481','1192004624745586689','1230704850994528257',
 '1201319745506598913','1201687651826360321','1201689212329746433')
                 group by st.id
@@ -478,7 +489,7 @@
                                 'agency' as orgType,
                                 sum(IFNULL(dg.createGroupTotal,0)) AS createGroupTotal,
                                 sum(IFNULL(dg.groupUserTotal,0)) AS groupUserTotal,
-				                DATE_FORMAT(now(),'%Y-%m-%d') as dataEndTime
+                                DATE_FORMAT(now(),'%Y%m%d') as dataEndTime
             from esua_epdc_admin.sys_dept city
             left join esua_epdc_admin.sys_dept st on city.id=st.pid
             left join esua_epdc_admin.sys_dept co on st.id=co.pid
@@ -502,824 +513,829 @@
                             and city.type_key='district_party' and city.party_code='shibei'
                 group by city.id
 
+
     </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,
-				'grid' 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, -- 党员发布议题占比(党员/用户)
-                 DATE_FORMAT(now(),'%Y-%m-%d') as dataEndTime
-	FROM esua_epdc_admin.sys_dept gr
-	left join
-		(select  total.GRID_ID,
-						 sum(total.issueSum) as issueSum, -- 议题总数
-						 sum(total.publishIssueSum) as publishIssueSum,-- 党员发布的议题总数
-						 sum(total.issueTotal) as issueTotal, -- 议事总数
-						 sum(total.publishIssueTotal) as publishIssueTotal, -- 党员发布的议事总数
-						 sum(total.topicTotal) as topicTotal, -- 话题总数
-						 sum(total.publishTopicTotal) as publishTopicTotal, -- 党员发布的话题总数
-						 sum(total.shiftProjectTotal) as shiftProjectTotal, -- 议题转项目数
-						 sum(total.publishShiftProjectTotal) as publishShiftProjectTotal, -- 党员议题转项目数
-						 sum(total.resolvedProjectTotal) as resolvedProjectTotal, -- 已解决项目总数
-						 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,
-							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
-
-	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,
-							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
-		group by 	total.GRID_ID)t on gr.id=t.GRID_ID
-		where gr.del_flag=0
-					and gr.type_key='grid_party'
-					and gr.id not in ('1191534129122230274','1191534416067149825','1191535301279203329','1191535501527859202',
+            SELECT gr.id as orgId,
+                 gr.name as orgName,
+                 gr.pid as parentId,
+                'grid' 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, -- 党员发布议题占比(党员/用户)
+                 DATE_FORMAT(now(),'%Y%m%d') as dataEndTime
+    FROM esua_epdc_admin.sys_dept gr
+    left join
+        (select  total.GRID_ID,
+                         sum(total.issueSum) as issueSum, -- 议题总数
+                         sum(total.publishIssueSum) as publishIssueSum,-- 党员发布的议题总数
+                         sum(total.issueTotal) as issueTotal, -- 议事总数
+                         sum(total.publishIssueTotal) as publishIssueTotal, -- 党员发布的议事总数
+                         sum(total.topicTotal) as topicTotal, -- 话题总数
+                         sum(total.publishTopicTotal) as publishTopicTotal, -- 党员发布的话题总数
+                         sum(total.shiftProjectTotal) as shiftProjectTotal, -- 议题转项目数
+                         sum(total.publishShiftProjectTotal) as publishShiftProjectTotal, -- 党员议题转项目数
+                         sum(total.resolvedProjectTotal) as resolvedProjectTotal, -- 已解决项目总数
+                         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,
+                            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
+
+    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,
+                            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
+        group by    total.GRID_ID)t on gr.id=t.GRID_ID
+        where gr.del_flag=0
+                    and gr.type_key='grid_party'
+                    and gr.id not in ('1191534129122230274','1191534416067149825','1191535301279203329','1191535501527859202',
 '1191535697380884481','1192004624745586689','1230704850994528257',
 '1201319745506598913','1201687651826360321','1201689212329746433')
 
 
 UNION ALL
 
-	SELECT co.id as orgId,
-				 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, -- 党员发布议题占比(党员/用户)
-				 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
-	left join
-		(select  total.GRID_ID,
-						 sum(total.issueSum) as issueSum, -- 议题总数
-						 sum(total.publishIssueSum) as publishIssueSum,-- 党员发布的议题总数
-						 sum(total.issueTotal) as issueTotal, -- 议事总数
-						 sum(total.publishIssueTotal) as publishIssueTotal, -- 党员发布的议事总数
-						 sum(total.topicTotal) as topicTotal, -- 话题总数
-						 sum(total.publishTopicTotal) as publishTopicTotal, -- 党员发布的话题总数
-						 sum(total.shiftProjectTotal) as shiftProjectTotal, -- 议题转项目数
-						 sum(total.publishShiftProjectTotal) as publishShiftProjectTotal, -- 党员议题转项目数
-						 sum(total.resolvedProjectTotal) as resolvedProjectTotal, -- 已解决项目总数
-						 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,
-							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
-
-	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,
-							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
-		group by 	total.GRID_ID)t on gr.id=t.GRID_ID
-		where gr.del_flag=0
-					and co.del_flag=0
-					and co.type_key='community_party'
-					and co.id not in ('1191534129122230274','1191534416067149825','1191535301279203329','1191535501527859202',
+    SELECT co.id as orgId,
+                 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, -- 党员发布议题占比(党员/用户)
+                 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
+    left join
+        (select  total.GRID_ID,
+                         sum(total.issueSum) as issueSum, -- 议题总数
+                         sum(total.publishIssueSum) as publishIssueSum,-- 党员发布的议题总数
+                         sum(total.issueTotal) as issueTotal, -- 议事总数
+                         sum(total.publishIssueTotal) as publishIssueTotal, -- 党员发布的议事总数
+                         sum(total.topicTotal) as topicTotal, -- 话题总数
+                         sum(total.publishTopicTotal) as publishTopicTotal, -- 党员发布的话题总数
+                         sum(total.shiftProjectTotal) as shiftProjectTotal, -- 议题转项目数
+                         sum(total.publishShiftProjectTotal) as publishShiftProjectTotal, -- 党员议题转项目数
+                         sum(total.resolvedProjectTotal) as resolvedProjectTotal, -- 已解决项目总数
+                         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,
+                            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
+
+    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,
+                            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
+        group by    total.GRID_ID)t on gr.id=t.GRID_ID
+        where gr.del_flag=0
+                    and co.del_flag=0
+                    and co.type_key='community_party'
+                    and co.id not in ('1191534129122230274','1191534416067149825','1191535301279203329','1191535501527859202',
 '1191535697380884481','1192004624745586689','1230704850994528257',
 '1201319745506598913','1201687651826360321','1201689212329746433')
-		GROUP BY co.id
+        GROUP BY co.id
 
 union all
 
-	SELECT st.id as orgId,
-				 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, -- 党员发布议题占比(党员/用户)
-				 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
-	LEFT JOIN esua_epdc_admin.sys_dept gr on co.id=gr.pid
-	left join
-		(select  total.GRID_ID,
-						 sum(total.issueSum) as issueSum, -- 议题总数
-						 sum(total.publishIssueSum) as publishIssueSum,-- 党员发布的议题总数
-						 sum(total.issueTotal) as issueTotal, -- 议事总数
-						 sum(total.publishIssueTotal) as publishIssueTotal, -- 党员发布的议事总数
-						 sum(total.topicTotal) as topicTotal, -- 话题总数
-						 sum(total.publishTopicTotal) as publishTopicTotal, -- 党员发布的话题总数
-						 sum(total.shiftProjectTotal) as shiftProjectTotal, -- 议题转项目数
-						 sum(total.publishShiftProjectTotal) as publishShiftProjectTotal, -- 党员议题转项目数
-						 sum(total.resolvedProjectTotal) as resolvedProjectTotal, -- 已解决项目总数
-						 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,
-							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
-
-	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,
-							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
-		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 st.type_key='street_party'
-					and st.id not in ('1191534129122230274','1191534416067149825','1191535301279203329','1191535501527859202',
+    SELECT st.id as orgId,
+                 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, -- 党员发布议题占比(党员/用户)
+                 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
+    LEFT JOIN esua_epdc_admin.sys_dept gr on co.id=gr.pid
+    left join
+        (select  total.GRID_ID,
+                         sum(total.issueSum) as issueSum, -- 议题总数
+                         sum(total.publishIssueSum) as publishIssueSum,-- 党员发布的议题总数
+                         sum(total.issueTotal) as issueTotal, -- 议事总数
+                         sum(total.publishIssueTotal) as publishIssueTotal, -- 党员发布的议事总数
+                         sum(total.topicTotal) as topicTotal, -- 话题总数
+                         sum(total.publishTopicTotal) as publishTopicTotal, -- 党员发布的话题总数
+                         sum(total.shiftProjectTotal) as shiftProjectTotal, -- 议题转项目数
+                         sum(total.publishShiftProjectTotal) as publishShiftProjectTotal, -- 党员议题转项目数
+                         sum(total.resolvedProjectTotal) as resolvedProjectTotal, -- 已解决项目总数
+                         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,
+                            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
+
+    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,
+                            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
+        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 st.type_key='street_party'
+                    and st.id not in ('1191534129122230274','1191534416067149825','1191535301279203329','1191535501527859202',
 '1191535697380884481','1192004624745586689','1230704850994528257',
 '1201319745506598913','1201687651826360321','1201689212329746433')
-		GROUP BY st.id
+        GROUP BY st.id
 
 union all
 
-	SELECT city.id as orgId,
-				 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, -- 党员发布议题占比(党员/用户)
-				 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
-	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
-	left join
-		(select  total.GRID_ID,
-						 sum(total.issueSum) as issueSum, -- 议题总数
-						 sum(total.publishIssueSum) as publishIssueSum,-- 党员发布的议题总数
-						 sum(total.issueTotal) as issueTotal, -- 议事总数
-						 sum(total.publishIssueTotal) as publishIssueTotal, -- 党员发布的议事总数
-						 sum(total.topicTotal) as topicTotal, -- 话题总数
-						 sum(total.publishTopicTotal) as publishTopicTotal, -- 党员发布的话题总数
-						 sum(total.shiftProjectTotal) as shiftProjectTotal, -- 议题转项目数
-						 sum(total.publishShiftProjectTotal) as publishShiftProjectTotal, -- 党员议题转项目数
-						 sum(total.resolvedProjectTotal) as resolvedProjectTotal, -- 已解决项目总数
-						 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,
-							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
-
-	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,
-							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 city.id as orgId,
+                 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, -- 党员发布议题占比(党员/用户)
+                 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
+    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
+    left join
+        (select  total.GRID_ID,
+                         sum(total.issueSum) as issueSum, -- 议题总数
+                         sum(total.publishIssueSum) as publishIssueSum,-- 党员发布的议题总数
+                         sum(total.issueTotal) as issueTotal, -- 议事总数
+                         sum(total.publishIssueTotal) as publishIssueTotal, -- 党员发布的议事总数
+                         sum(total.topicTotal) as topicTotal, -- 话题总数
+                         sum(total.publishTopicTotal) as publishTopicTotal, -- 党员发布的话题总数
+                         sum(total.shiftProjectTotal) as shiftProjectTotal, -- 议题转项目数
+                         sum(total.publishShiftProjectTotal) as publishShiftProjectTotal, -- 党员议题转项目数
+                         sum(total.resolvedProjectTotal) as resolvedProjectTotal, -- 已解决项目总数
+                         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,
+                            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
+
+    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,
+                            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
+        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 city.type_key='district_party' and city.party_code='shibei'
+        GROUP BY city.id
 
-		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
-		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 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">
-        	SELECT gr.id as orgId,
-				 gr.name as orgName,
-				 gr.pid as parentId,
-				'grid' as orgType,
-				 IFNULL(t.userTotal,0) AS userTotal,
-				 IFNULL(t.partyTotal,0) AS partyTotal,
-				 IFNULL(t.groupTotal,0) AS groupTotal,
-				 IFNULL(t.issueTotal,0) AS issueTotal,
-				 IFNULL(t.topicTotal,0) AS topicTotal,
-				 IFNULL(t.projectTotal,0) AS projectTotal,
-				 DATE_FORMAT(now(),'%Y-%m-%d') as dataEndTime
-	FROM esua_epdc_admin.sys_dept gr
-	left join
-		(select  total.GRID_ID,
-						sum(total.userTotal) as userTotal,
-						sum(total.partyTotal) as partyTotal,
-						sum(total.groupTotal) as groupTotal,
-						sum(total.issueTotal) as issueTotal,
-						sum(total.topicTotal) as topicTotal,
-						sum(total.projectTotal) as projectTotal
-			from
-			(select eu.DEPT_ID AS GRID_ID,
-						count(eu.id) as userTotal,
-						count(eu.PARTY_FLAG = '1' OR NULL ) AS partyTotal,
-						0 as groupTotal,
-						0 as issueTotal,
-						0 as topicTotal,
-						0 as projectTotal
-				from esua_epdc_user.epdc_user eu
-				where eu.DEL_FLAG=0
-				group by eu.DEPT_ID
-
-		UNION ALL
-
-			select  GRID_ID,
-							0 as userTotal,
-							0 AS partyTotal,
-							count(id) as groupTotal,
-							0 as issueTotal,
-							0 as topicTotal,
-							0 as projectTotal
-				from esua_epdc_group.epdc_group
-				where DEL_FLAG=0 and STATE=10
-				group by GRID_ID
-
-		union all
 
-			select  GRID_ID,
-							0 as userTotal,
-							0 AS partyTotal,
-							0 as groupTotal,
-							count(id) as issueTotal,
-							0 as topicTotal,
-							0 as projectTotal
-				from esua_epdc_events.epdc_issue
-				where DEL_FLAG=0
-				group by GRID_ID
-
-		UNION ALL
-
-			select GRID_ID,
-							0 as userTotal,
-							0 AS partyTotal,
-							0 as groupTotal,
-							0 as issueTotal,
-							count(id) as topicTotal,
-							0 as projectTotal
-				from esua_epdc_group.epdc_topic
-				where DEL_FLAG=0
-				group by GRID_ID
+            SELECT gr.id as orgId,
+                 gr.name as orgName,
+                 gr.pid as parentId,
+                'grid' as orgType,
+                 IFNULL(t.userTotal,0) AS userTotal,
+                 IFNULL(t.partyTotal,0) AS partyTotal,
+                 IFNULL(t.groupTotal,0) AS groupTotal,
+                 IFNULL(t.issueTotal,0) AS issueTotal,
+                 IFNULL(t.topicTotal,0) AS topicTotal,
+                 IFNULL(t.projectTotal,0) AS projectTotal,
+                 DATE_FORMAT(now(),'%Y%m%d') as dataEndTime
+    FROM esua_epdc_admin.sys_dept gr
+    left join
+        (select  total.GRID_ID,
+                        sum(total.userTotal) as userTotal,
+                        sum(total.partyTotal) as partyTotal,
+                        sum(total.groupTotal) as groupTotal,
+                        sum(total.issueTotal) as issueTotal,
+                        sum(total.topicTotal) as topicTotal,
+                        sum(total.projectTotal) as projectTotal
+            from
+            (select eu.DEPT_ID AS GRID_ID,
+                        count(eu.id) as userTotal,
+                        count(eu.PARTY_FLAG = '1' OR NULL ) AS partyTotal,
+                        0 as groupTotal,
+                        0 as issueTotal,
+                        0 as topicTotal,
+                        0 as projectTotal
+                from esua_epdc_user.epdc_user eu
+                where eu.DEL_FLAG=0
+                group by eu.DEPT_ID
+
+        UNION ALL
+
+            select  GRID_ID,
+                            0 as userTotal,
+                            0 AS partyTotal,
+                            count(id) as groupTotal,
+                            0 as issueTotal,
+                            0 as topicTotal,
+                            0 as projectTotal
+                from esua_epdc_group.epdc_group
+                where DEL_FLAG=0 and STATE=10
+                group by GRID_ID
 
-		UNION ALL
+        union all
 
-		select GRID_ID,
-						0 as userTotal,
-						0 AS partyTotal,
-						0 as groupTotal,
-						0 as issueTotal,
-						0 as topicTotal,
-						count(id) as projectTotal
-			from esua_epdc_events.epdc_item
-			where DEL_FLAG=0
-			group by 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'
-					and gr.id not in ('1191534129122230274','1191534416067149825','1191535301279203329','1191535501527859202',
+            select  GRID_ID,
+                            0 as userTotal,
+                            0 AS partyTotal,
+                            0 as groupTotal,
+                            count(id) as issueTotal,
+                            0 as topicTotal,
+                            0 as projectTotal
+                from esua_epdc_events.epdc_issue
+                where DEL_FLAG=0
+                group by GRID_ID
+
+        UNION ALL
+
+            select GRID_ID,
+                            0 as userTotal,
+                            0 AS partyTotal,
+                            0 as groupTotal,
+                            0 as issueTotal,
+                            count(id) as topicTotal,
+                            0 as projectTotal
+                from esua_epdc_group.epdc_topic
+                where DEL_FLAG=0
+                group by GRID_ID
+
+        UNION ALL
+
+        select GRID_ID,
+                        0 as userTotal,
+                        0 AS partyTotal,
+                        0 as groupTotal,
+                        0 as issueTotal,
+                        0 as topicTotal,
+                        count(id) as projectTotal
+            from esua_epdc_events.epdc_item
+            where DEL_FLAG=0
+            group by 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'
+                    and gr.id not in ('1191534129122230274','1191534416067149825','1191535301279203329','1191535501527859202',
 '1191535697380884481','1192004624745586689','1230704850994528257',
 '1201319745506598913','1201687651826360321','1201689212329746433')
 
 UNION ALL
 
-	SELECT co.id as orgId,
-				 co.name as orgName,
-				 co.pid as parentId,
-				'agency' as orgType,
-				 SUM(IFNULL(t.userTotal,0)) AS userTotal,
-				 SUM(IFNULL(t.partyTotal,0)) AS partyTotal,
-				 SUM(IFNULL(t.groupTotal,0)) AS groupTotal,
-				 SUM(IFNULL(t.issueTotal,0)) AS issueTotal,
-				 SUM(IFNULL(t.topicTotal,0)) AS topicTotal,
-				 SUM(IFNULL(t.projectTotal,0)) AS projectTotal,
-				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
-	left join
-		(select  total.GRID_ID,
-						 sum(total.userTotal) as userTotal,
-						 sum(total.partyTotal) as partyTotal,
-						 sum(total.groupTotal) as groupTotal,
-						 sum(total.issueTotal) as issueTotal,
-						 sum(total.topicTotal) as topicTotal,
-						 sum(total.projectTotal) as projectTotal
-			from
-			(select eu.DEPT_ID AS GRID_ID,
-						count(eu.id) as userTotal,
-						count(eu.PARTY_FLAG = '1' OR NULL ) AS partyTotal,
-						0 as groupTotal,
-						0 as issueTotal,
-						0 as topicTotal,
-						0 as projectTotal
-				from esua_epdc_user.epdc_user eu
-				where eu.DEL_FLAG=0
-				group by eu.DEPT_ID
-
-		UNION ALL
-
-		select  GRID_ID,
-							0 as userTotal,
-							0 AS partyTotal,
-							count(id) as groupTotal,
-							0 as issueTotal,
-							0 as topicTotal,
-							0 as projectTotal
-				from esua_epdc_group.epdc_group
-				where DEL_FLAG=0 and STATE=10
-				group by GRID_ID
-
-		union all
-
-			select  GRID_ID,
-							0 as userTotal,
-							0 AS partyTotal,
-						  0 as groupTotal,
-							count(id) as issueTotal,
-							0 as topicTotal,
-							0 as projectTotal
-				from esua_epdc_events.epdc_issue
-				where DEL_FLAG=0
-				group by GRID_ID
-
-		UNION ALL
-
-			select GRID_ID,
-							0 as userTotal,
-							0 AS partyTotal,
-						  0 as groupTotal,
-							0 as issueTotal,
-							count(id) as topicTotal,
-							0 as projectTotal
-				from esua_epdc_group.epdc_topic
-				where DEL_FLAG=0
-				group by GRID_ID
+    SELECT co.id as orgId,
+                 co.name as orgName,
+                 co.pid as parentId,
+                'agency' as orgType,
+                 SUM(IFNULL(t.userTotal,0)) AS userTotal,
+                 SUM(IFNULL(t.partyTotal,0)) AS partyTotal,
+                 SUM(IFNULL(t.groupTotal,0)) AS groupTotal,
+                 SUM(IFNULL(t.issueTotal,0)) AS issueTotal,
+                 SUM(IFNULL(t.topicTotal,0)) AS topicTotal,
+                 SUM(IFNULL(t.projectTotal,0)) AS projectTotal,
+                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
+    left join
+        (select  total.GRID_ID,
+                         sum(total.userTotal) as userTotal,
+                         sum(total.partyTotal) as partyTotal,
+                         sum(total.groupTotal) as groupTotal,
+                         sum(total.issueTotal) as issueTotal,
+                         sum(total.topicTotal) as topicTotal,
+                         sum(total.projectTotal) as projectTotal
+            from
+            (select eu.DEPT_ID AS GRID_ID,
+                        count(eu.id) as userTotal,
+                        count(eu.PARTY_FLAG = '1' OR NULL ) AS partyTotal,
+                        0 as groupTotal,
+                        0 as issueTotal,
+                        0 as topicTotal,
+                        0 as projectTotal
+                from esua_epdc_user.epdc_user eu
+                where eu.DEL_FLAG=0
+                group by eu.DEPT_ID
+
+        UNION ALL
+
+        select  GRID_ID,
+                            0 as userTotal,
+                            0 AS partyTotal,
+                            count(id) as groupTotal,
+                            0 as issueTotal,
+                            0 as topicTotal,
+                            0 as projectTotal
+                from esua_epdc_group.epdc_group
+                where DEL_FLAG=0 and STATE=10
+                group by GRID_ID
 
-		UNION ALL
+        union all
 
-		select GRID_ID,
-						0 as userTotal,
-						0 AS partyTotal,
-						0 as groupTotal,
-						0 as issueTotal,
-						0 as topicTotal,
-						count(id) as projectTotal
-			from esua_epdc_events.epdc_item
-			where DEL_FLAG=0
-			group by 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 co.type_key='community_party'
-					and co.id not in ('1191534129122230274','1191534416067149825','1191535301279203329','1191535501527859202',
+            select  GRID_ID,
+                            0 as userTotal,
+                            0 AS partyTotal,
+                          0 as groupTotal,
+                            count(id) as issueTotal,
+                            0 as topicTotal,
+                            0 as projectTotal
+                from esua_epdc_events.epdc_issue
+                where DEL_FLAG=0
+                group by GRID_ID
+
+        UNION ALL
+
+            select GRID_ID,
+                            0 as userTotal,
+                            0 AS partyTotal,
+                          0 as groupTotal,
+                            0 as issueTotal,
+                            count(id) as topicTotal,
+                            0 as projectTotal
+                from esua_epdc_group.epdc_topic
+                where DEL_FLAG=0
+                group by GRID_ID
+
+        UNION ALL
+
+        select GRID_ID,
+                        0 as userTotal,
+                        0 AS partyTotal,
+                        0 as groupTotal,
+                        0 as issueTotal,
+                        0 as topicTotal,
+                        count(id) as projectTotal
+            from esua_epdc_events.epdc_item
+            where DEL_FLAG=0
+            group by 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 co.type_key='community_party'
+                    and co.id not in ('1191534129122230274','1191534416067149825','1191535301279203329','1191535501527859202',
 '1191535697380884481','1192004624745586689','1230704850994528257',
 '1201319745506598913','1201687651826360321','1201689212329746433')
-		GROUP BY co.id
+        GROUP BY co.id
 
 union all
 
-		SELECT st.id as orgId,
-				 st.name as orgName,
-				 st.pid as parentId,
-				'agency' as orgType,
-				 SUM(IFNULL(t.userTotal,0)) AS userTotal,
-				 SUM(IFNULL(t.partyTotal,0)) AS partyTotal,
-				 SUM(IFNULL(t.groupTotal,0)) AS groupTotal,
-				 SUM(IFNULL(t.issueTotal,0)) AS issueTotal,
-				 SUM(IFNULL(t.topicTotal,0)) AS topicTotal,
-				 SUM(IFNULL(t.projectTotal,0)) AS projectTotal,
-				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
-	LEFT JOIN esua_epdc_admin.sys_dept gr on co.id=gr.pid
-	left join
-		(select  total.GRID_ID,
-						 sum(total.userTotal) as userTotal,
-						 sum(total.partyTotal) as partyTotal,
-						 sum(total.groupTotal) as groupTotal,
-						 sum(total.issueTotal) as issueTotal,
-						 sum(total.topicTotal) as topicTotal,
-						 sum(total.projectTotal) as projectTotal
-			from
-			(select eu.DEPT_ID AS GRID_ID,
-						count(eu.id) as userTotal,
-						count(eu.PARTY_FLAG = '1' OR NULL ) AS partyTotal,
-						0 as groupTotal,
-						0 as issueTotal,
-						0 as topicTotal,
-						0 as projectTotal
-				from esua_epdc_user.epdc_user eu
-				where eu.DEL_FLAG=0
-				group by eu.DEPT_ID
-
-		UNION ALL
-
-		select  GRID_ID,
-							0 as userTotal,
-							0 AS partyTotal,
-							count(id) as groupTotal,
-							0 as issueTotal,
-							0 as topicTotal,
-							0 as projectTotal
-				from esua_epdc_group.epdc_group
-				where DEL_FLAG=0 and STATE=10
-				group by GRID_ID
-
-		union all
-
-			select  GRID_ID,
-							0 as userTotal,
-							0 AS partyTotal,
-						  0 as groupTotal,
-							count(id) as issueTotal,
-							0 as topicTotal,
-							0 as projectTotal
-				from esua_epdc_events.epdc_issue
-				where DEL_FLAG=0
-				group by GRID_ID
-
-		UNION ALL
-
-			select GRID_ID,
-							0 as userTotal,
-							0 AS partyTotal,
-						  0 as groupTotal,
-							0 as issueTotal,
-							count(id) as topicTotal,
-							0 as projectTotal
-				from esua_epdc_group.epdc_topic
-				where DEL_FLAG=0
-				group by GRID_ID
+        SELECT st.id as orgId,
+                 st.name as orgName,
+                 st.pid as parentId,
+                'agency' as orgType,
+                 SUM(IFNULL(t.userTotal,0)) AS userTotal,
+                 SUM(IFNULL(t.partyTotal,0)) AS partyTotal,
+                 SUM(IFNULL(t.groupTotal,0)) AS groupTotal,
+                 SUM(IFNULL(t.issueTotal,0)) AS issueTotal,
+                 SUM(IFNULL(t.topicTotal,0)) AS topicTotal,
+                 SUM(IFNULL(t.projectTotal,0)) AS projectTotal,
+                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
+    LEFT JOIN esua_epdc_admin.sys_dept gr on co.id=gr.pid
+    left join
+        (select  total.GRID_ID,
+                         sum(total.userTotal) as userTotal,
+                         sum(total.partyTotal) as partyTotal,
+                         sum(total.groupTotal) as groupTotal,
+                         sum(total.issueTotal) as issueTotal,
+                         sum(total.topicTotal) as topicTotal,
+                         sum(total.projectTotal) as projectTotal
+            from
+            (select eu.DEPT_ID AS GRID_ID,
+                        count(eu.id) as userTotal,
+                        count(eu.PARTY_FLAG = '1' OR NULL ) AS partyTotal,
+                        0 as groupTotal,
+                        0 as issueTotal,
+                        0 as topicTotal,
+                        0 as projectTotal
+                from esua_epdc_user.epdc_user eu
+                where eu.DEL_FLAG=0
+                group by eu.DEPT_ID
+
+        UNION ALL
+
+        select  GRID_ID,
+                            0 as userTotal,
+                            0 AS partyTotal,
+                            count(id) as groupTotal,
+                            0 as issueTotal,
+                            0 as topicTotal,
+                            0 as projectTotal
+                from esua_epdc_group.epdc_group
+                where DEL_FLAG=0 and STATE=10
+                group by GRID_ID
 
-		UNION ALL
+        union all
 
-		select GRID_ID,
-						0 as userTotal,
-						0 AS partyTotal,
-						0 as groupTotal,
-						0 as issueTotal,
-						0 as topicTotal,
-						count(id) as projectTotal
-			from esua_epdc_events.epdc_item
-			where DEL_FLAG=0
-			group by 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 st.type_key='street_party'
-					and st.id not in ('1191534129122230274','1191534416067149825','1191535301279203329','1191535501527859202',
+            select  GRID_ID,
+                            0 as userTotal,
+                            0 AS partyTotal,
+                          0 as groupTotal,
+                            count(id) as issueTotal,
+                            0 as topicTotal,
+                            0 as projectTotal
+                from esua_epdc_events.epdc_issue
+                where DEL_FLAG=0
+                group by GRID_ID
+
+        UNION ALL
+
+            select GRID_ID,
+                            0 as userTotal,
+                            0 AS partyTotal,
+                          0 as groupTotal,
+                            0 as issueTotal,
+                            count(id) as topicTotal,
+                            0 as projectTotal
+                from esua_epdc_group.epdc_topic
+                where DEL_FLAG=0
+                group by GRID_ID
+
+        UNION ALL
+
+        select GRID_ID,
+                        0 as userTotal,
+                        0 AS partyTotal,
+                        0 as groupTotal,
+                        0 as issueTotal,
+                        0 as topicTotal,
+                        count(id) as projectTotal
+            from esua_epdc_events.epdc_item
+            where DEL_FLAG=0
+            group by 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 st.type_key='street_party'
+                    and st.id not in ('1191534129122230274','1191534416067149825','1191535301279203329','1191535501527859202',
 '1191535697380884481','1192004624745586689','1230704850994528257',
 '1201319745506598913','1201687651826360321','1201689212329746433')
-		GROUP BY st.id
+        GROUP BY st.id
 
 union all
 
-		SELECT city.id as orgId,
-				 city.name as orgName,
-				 city.pid as parentId,
-				'agency' as orgType,
-				 SUM(IFNULL(t.userTotal,0)) AS userTotal,
-				 SUM(IFNULL(t.partyTotal,0)) AS partyTotal,
-				 SUM(IFNULL(t.groupTotal,0)) AS groupTotal,
-				 SUM(IFNULL(t.issueTotal,0)) AS issueTotal,
-				 SUM(IFNULL(t.topicTotal,0)) AS topicTotal,
-				 SUM(IFNULL(t.projectTotal,0)) AS projectTotal,
-				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
-	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
-	left join
-		(select  total.GRID_ID,
-						 sum(total.userTotal) as userTotal,
-						 sum(total.partyTotal) as partyTotal,
-						 sum(total.groupTotal) as groupTotal,
-						 sum(total.issueTotal) as issueTotal,
-						 sum(total.topicTotal) as topicTotal,
-						 sum(total.projectTotal) as projectTotal
-			from
-			(select eu.DEPT_ID AS GRID_ID,
-						count(eu.id) as userTotal,
-						count(eu.PARTY_FLAG = '1' OR NULL ) AS partyTotal,
-						0 as groupTotal,
-						0 as issueTotal,
-						0 as topicTotal,
-						0 as projectTotal
-				from esua_epdc_user.epdc_user eu
-				where eu.DEL_FLAG=0
-				group by eu.DEPT_ID
-
-		UNION ALL
-
-		select  GRID_ID,
-							0 as userTotal,
-							0 AS partyTotal,
-							count(id) as groupTotal,
-							0 as issueTotal,
-							0 as topicTotal,
-							0 as projectTotal
-				from esua_epdc_group.epdc_group
-				where DEL_FLAG=0 and STATE=10
-				group by GRID_ID
-
-		union all
-
-			select  GRID_ID,
-							0 as userTotal,
-							0 AS partyTotal,
-						  0 as groupTotal,
-							count(id) as issueTotal,
-							0 as topicTotal,
-							0 as projectTotal
-				from esua_epdc_events.epdc_issue
-				where DEL_FLAG=0
-				group by GRID_ID
-
-		UNION ALL
-
-			select GRID_ID,
-							0 as userTotal,
-							0 AS partyTotal,
-						  0 as groupTotal,
-							0 as issueTotal,
-							count(id) as topicTotal,
-							0 as projectTotal
-				from esua_epdc_group.epdc_topic
-				where DEL_FLAG=0
-				group by GRID_ID
+        SELECT city.id as orgId,
+                 city.name as orgName,
+                 city.pid as parentId,
+                'agency' as orgType,
+                 SUM(IFNULL(t.userTotal,0)) AS userTotal,
+                 SUM(IFNULL(t.partyTotal,0)) AS partyTotal,
+                 SUM(IFNULL(t.groupTotal,0)) AS groupTotal,
+                 SUM(IFNULL(t.issueTotal,0)) AS issueTotal,
+                 SUM(IFNULL(t.topicTotal,0)) AS topicTotal,
+                 SUM(IFNULL(t.projectTotal,0)) AS projectTotal,
+                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
+    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
+    left join
+        (select  total.GRID_ID,
+                         sum(total.userTotal) as userTotal,
+                         sum(total.partyTotal) as partyTotal,
+                         sum(total.groupTotal) as groupTotal,
+                         sum(total.issueTotal) as issueTotal,
+                         sum(total.topicTotal) as topicTotal,
+                         sum(total.projectTotal) as projectTotal
+            from
+            (select eu.DEPT_ID AS GRID_ID,
+                        count(eu.id) as userTotal,
+                        count(eu.PARTY_FLAG = '1' OR NULL ) AS partyTotal,
+                        0 as groupTotal,
+                        0 as issueTotal,
+                        0 as topicTotal,
+                        0 as projectTotal
+                from esua_epdc_user.epdc_user eu
+                where eu.DEL_FLAG=0
+                group by eu.DEPT_ID
+
+        UNION ALL
+
+        select  GRID_ID,
+                            0 as userTotal,
+                            0 AS partyTotal,
+                            count(id) as groupTotal,
+                            0 as issueTotal,
+                            0 as topicTotal,
+                            0 as projectTotal
+                from esua_epdc_group.epdc_group
+                where DEL_FLAG=0 and STATE=10
+                group by GRID_ID
 
-		UNION ALL
+        union all
 
-		select GRID_ID,
-						0 as userTotal,
-						0 AS partyTotal,
-						0 as groupTotal,
-						0 as issueTotal,
-						0 as topicTotal,
-						count(id) as projectTotal
-			from esua_epdc_events.epdc_item
-			where DEL_FLAG=0
-			group by 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',
+            select  GRID_ID,
+                            0 as userTotal,
+                            0 AS partyTotal,
+                          0 as groupTotal,
+                            count(id) as issueTotal,
+                            0 as topicTotal,
+                            0 as projectTotal
+                from esua_epdc_events.epdc_issue
+                where DEL_FLAG=0
+                group by GRID_ID
+
+        UNION ALL
+
+            select GRID_ID,
+                            0 as userTotal,
+                            0 AS partyTotal,
+                          0 as groupTotal,
+                            0 as issueTotal,
+                            count(id) as topicTotal,
+                            0 as projectTotal
+                from esua_epdc_group.epdc_topic
+                where DEL_FLAG=0
+                group by GRID_ID
+
+        UNION ALL
+
+        select GRID_ID,
+                        0 as userTotal,
+                        0 AS partyTotal,
+                        0 as groupTotal,
+                        0 as issueTotal,
+                        0 as topicTotal,
+                        count(id) as projectTotal
+            from esua_epdc_events.epdc_item
+            where DEL_FLAG=0
+            group by 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
+                    and city.type_key='district_party' and city.party_code='shibei'
+        GROUP BY city.id
+
     </select>
     <select id="meetdata" resultType="com.elink.esua.epdc.dto.screen.result.MeetdataResultDTO">
         select  d.id as orgId,
@@ -1606,7 +1622,7 @@ union all -- 市北区
               sd.area_marks areaMarks,
               sd.center_mark centerMark,
               '' partyMark,
-				DATE_FORMAT(now(),'%Y-%m-%d') as dataEndTime,
+				DATE_FORMAT(now(),'%Y%m%d') as dataEndTime,
 				d1.pids as allParentIds
                 from esua_epdc_admin.sys_dept_temp sd
             left join esua_epdc_admin.sys_dept d1 on d1.ID = sd.ID
@@ -1639,7 +1655,7 @@ union all -- 市北区
               '' partyMark,
               SUBSTRING_INDEX(sd.type_key,'_',1) as level,
               '' areaCode,
-				DATE_FORMAT(now(),'%Y-%m-%d') as dataEndTime
+				DATE_FORMAT(now(),'%Y%m%d') as dataEndTime
                 from esua_epdc_admin.sys_dept_temp sd
             left join esua_epdc_admin.sys_dept d1 on d1.ID = sd.ID
             left join esua_epdc_admin.sys_dept d2 on d2.ID = d1.PID