From 4e94f43827f60834513df359d3f044af8c002e9b Mon Sep 17 00:00:00 2001
From: Jackwang <wt373747285@163.com>
Date: Thu, 3 Sep 2020 09:31:12 +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=E6=97=A5=E6=9C=9F=E7=9B=B8=E5=85=B3?=
 =?UTF-8?q?=E8=B0=83=E6=95=B4=E3=80=91-=EF=BC=88=E7=8E=8B=E7=AB=A5?=
 =?UTF-8?q?=EF=BC=89-2020/9/3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mapper/screen/DataStatsScreencollDao.xml  | 536 +++++++++---------
 1 file changed, 274 insertions(+), 262 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 530efd2d3..fcf6d6186 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
@@ -392,13 +392,14 @@
     </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
+                DATE_FORMAT(date_add( now( ), INTERVAL - 1 day),'%Y%m%d') as dataEndTime
             from esua_epdc_admin.sys_dept gr
             left join
                  (select  eg.GRID_ID,
@@ -425,7 +426,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(date_add( now( ), INTERVAL - 1 day),'%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
@@ -456,7 +457,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(date_add( now( ), INTERVAL - 1 day),'%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
@@ -489,7 +490,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(date_add( now( ), INTERVAL - 1 day),'%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
@@ -514,8 +515,10 @@
                 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,
@@ -530,7 +533,7 @@
                  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
+                 DATE_FORMAT(date_add( now( ), INTERVAL - 1 day),'%Y%m%d') as dataEndTime
     FROM esua_epdc_admin.sys_dept gr
     left join
         (select  total.GRID_ID,
@@ -622,7 +625,7 @@ UNION ALL
                  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
+                 DATE_FORMAT(date_add( now( ), INTERVAL - 1 day),'%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
@@ -716,7 +719,7 @@ union all
                  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
+                 DATE_FORMAT(date_add( now( ), INTERVAL - 1 day),'%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
@@ -812,7 +815,7 @@ union all
                  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
+                 DATE_FORMAT(date_add( now( ), INTERVAL - 1 day),'%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
@@ -893,6 +896,7 @@ union all
 '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">
 
@@ -1280,281 +1284,285 @@ union all
     </select>
     <select id="meetdata" resultType="com.elink.esua.epdc.dto.screen.result.MeetdataResultDTO">
 
+
+
         select  d.id as orgId,
-				d.name as orgName,
-				d.pid as parentId,
-				'grid' as orgType,
-				date_format( now( ), '%Y' ) as yearId,
-				date_format( now( ), '%Y%m' ) as monthId,
-				(CASE WHEN ed.DAILY_TYPE='10' THEN 'party'
-						  WHEN ed.DAILY_TYPE='20' THEN 'union'
-						  WHEN ed.DAILY_TYPE='30' THEN 'voluntaryservice' end) as type,
-				ed.MEET_TYPE as meetCategoryId,
-				me.RESOURCE_LABEL as meetCategoryName,
-				count(ed.id) as organizeCount,
-				IFNULL(sum(ed.JOIN_NUM),0) as joinUserCount,
-				IFNULL(round(IFNULL(sum(ed.JOIN_NUM),0)/count(ed.id),0),0) as averageJoinUserCount
-	FROM esua_epdc_admin.sys_dept d
-		left join (select  id,
-											 DAILY_TYPE,
-											 if(DAILY_TYPE='30','30',MEET_TYPE) as MEET_TYPE,
-											 DEPT_ID,
-											 JOIN_NUM,
-											 DEL_FLAG
-								from esua_epdc_workrecord.epdc_daily_record_info
-								where date_format( CREATED_TIME, '%Y-%m' ) = date_format( now( ), '%Y-%m' ) )ed on ed.DEPT_ID=d.id
-		left join esua_epdc_workrecord.epdc_resources_dictionary me on me.RESOURCE_CODE=ed.MEET_TYPE
-	WHERE d.DEL_FLAG=0
-				and ed.DEL_FLAG=0
-				and d.type_key='grid_party'
-				and d.id not in ('1191534129122230274','1191534416067149825','1191535301279203329','1191535501527859202',
+                d.name as orgName,
+                d.pid as parentId,
+                'grid' as orgType,
+                date_format( date_add( now( ), INTERVAL - 1 day), '%Y' ) as yearId,
+                date_format( date_add( now( ), INTERVAL - 1 day), '%Y%m' ) as monthId,
+                (CASE WHEN ed.DAILY_TYPE='10' THEN 'party'
+                          WHEN ed.DAILY_TYPE='20' THEN 'union'
+                          WHEN ed.DAILY_TYPE='30' THEN 'voluntaryservice' end) as type,
+                ed.MEET_TYPE as meetCategoryId,
+                me.RESOURCE_LABEL as meetCategoryName,
+                count(ed.id) as organizeCount,
+                IFNULL(sum(ed.JOIN_NUM),0) as joinUserCount,
+                IFNULL(round(IFNULL(sum(ed.JOIN_NUM),0)/count(ed.id),0),0) as averageJoinUserCount
+    FROM esua_epdc_admin.sys_dept d
+        left join (select  id,
+                                             DAILY_TYPE,
+                                             if(DAILY_TYPE='30','30',MEET_TYPE) as MEET_TYPE,
+                                             DEPT_ID,
+                                             JOIN_NUM,
+                                             DEL_FLAG
+                                from esua_epdc_workrecord.epdc_daily_record_info
+                                where date_format( CREATED_TIME, '%Y-%m' ) = date_format( date_add( now( ), INTERVAL - 1 day), '%Y-%m' ) )ed on ed.DEPT_ID=d.id
+        left join esua_epdc_workrecord.epdc_resources_dictionary me on me.RESOURCE_CODE=ed.MEET_TYPE
+    WHERE d.DEL_FLAG=0
+                and ed.DEL_FLAG=0
+                and d.type_key='grid_party'
+                and d.id not in ('1191534129122230274','1191534416067149825','1191535301279203329','1191535501527859202',
 '1191535697380884481','1192004624745586689','1230704850994528257',
 '1201319745506598913','1201687651826360321','1201689212329746433')
-	group by ed.DEPT_ID,date_format( now( ), '%Y%m' ),ed.DAILY_TYPE,ed.MEET_TYPE
+    group by ed.DEPT_ID,date_format( now( ), '%Y%m' ),ed.DAILY_TYPE,ed.MEET_TYPE
 
 union all -- 社区
 
-		select  community.orgId,
-						community.orgName,
-						community.parentId,
-						'agency' as orgType,
-						community.yearId,
-						community.monthId,
-						community.type,
-						community.meetCategoryId,
-						community.meetCategoryName,
-						SUM(community.organizeCount) AS organizeCount,
-						SUM(community.joinUserCount) AS joinUserCount,
-						IFNULL(round(SUM(community.joinUserCount)/SUM(community.organizeCount),0),0) as averageJoinUserCount
-			from
-			(select  co.id as orgId,
-						co.name as orgName,
-						co.pid as parentId,
-						date_format( now( ), '%Y' ) as yearId,
-						date_format( now( ), '%Y%m' ) as monthId,
-						ed.DAILY_TYPE,
-						(CASE WHEN ed.DAILY_TYPE='10' THEN 'party'
-									WHEN ed.DAILY_TYPE='20' THEN 'union'
-									WHEN ed.DAILY_TYPE='30' THEN 'voluntaryservice' end) as type,
-						ed.MEET_TYPE as meetCategoryId,
-						me.RESOURCE_LABEL as meetCategoryName,
-						count(ed.id) as organizeCount,
-						IFNULL(sum(ed.JOIN_NUM),0) as joinUserCount
-			FROM esua_epdc_admin.sys_dept co
-				left join esua_epdc_admin.sys_dept gr on co.id=gr.pid
-				left join (select  id,
-													 DAILY_TYPE,
-													 if(DAILY_TYPE='30','30',MEET_TYPE) as MEET_TYPE,
-													 DEPT_ID,
-													 JOIN_NUM,
-													 DEL_FLAG
-										from esua_epdc_workrecord.epdc_daily_record_info
-										where date_format( CREATED_TIME, '%Y-%m' ) = date_format( now( ), '%Y-%m' ) )ed on ed.DEPT_ID=gr.id
-				left join esua_epdc_workrecord.epdc_resources_dictionary me on me.RESOURCE_CODE=ed.MEET_TYPE
-			WHERE gr.DEL_FLAG=0
-						and co.DEL_FLAG=0
-						and ed.DEL_FLAG=0
-						and co.type_key='community_party'
-						and co.id not in ('1191534129122230274','1191534416067149825','1191535301279203329','1191535501527859202',
+        select  community.orgId,
+                        community.orgName,
+                        community.parentId,
+                        'agency' as orgType,
+                        community.yearId,
+                        community.monthId,
+                        community.type,
+                        community.meetCategoryId,
+                        community.meetCategoryName,
+                        SUM(community.organizeCount) AS organizeCount,
+                        SUM(community.joinUserCount) AS joinUserCount,
+                        IFNULL(round(SUM(community.joinUserCount)/SUM(community.organizeCount),0),0) as averageJoinUserCount
+            from
+            (select  co.id as orgId,
+                        co.name as orgName,
+                        co.pid as parentId,
+                        date_format( date_add( now( ), INTERVAL - 1 day), '%Y' ) as yearId,
+                        date_format( date_add( now( ), INTERVAL - 1 day), '%Y%m' ) as monthId,
+                        ed.DAILY_TYPE,
+                        (CASE WHEN ed.DAILY_TYPE='10' THEN 'party'
+                                    WHEN ed.DAILY_TYPE='20' THEN 'union'
+                                    WHEN ed.DAILY_TYPE='30' THEN 'voluntaryservice' end) as type,
+                        ed.MEET_TYPE as meetCategoryId,
+                        me.RESOURCE_LABEL as meetCategoryName,
+                        count(ed.id) as organizeCount,
+                        IFNULL(sum(ed.JOIN_NUM),0) as joinUserCount
+            FROM esua_epdc_admin.sys_dept co
+                left join esua_epdc_admin.sys_dept gr on co.id=gr.pid
+                left join (select  id,
+                                                     DAILY_TYPE,
+                                                     if(DAILY_TYPE='30','30',MEET_TYPE) as MEET_TYPE,
+                                                     DEPT_ID,
+                                                     JOIN_NUM,
+                                                     DEL_FLAG
+                                        from esua_epdc_workrecord.epdc_daily_record_info
+                                        where date_format( CREATED_TIME, '%Y-%m' ) = date_format( date_add( now( ), INTERVAL - 1 day), '%Y-%m' ) )ed on ed.DEPT_ID=gr.id
+                left join esua_epdc_workrecord.epdc_resources_dictionary me on me.RESOURCE_CODE=ed.MEET_TYPE
+            WHERE gr.DEL_FLAG=0
+                        and co.DEL_FLAG=0
+                        and ed.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,date_format( now( ), '%Y%m' ),ed.DAILY_TYPE,ed.MEET_TYPE
+            group by co.id,date_format( now( ), '%Y%m' ),ed.DAILY_TYPE,ed.MEET_TYPE
 
-		union all
-			select  d.id as orgId,
-						d.name as orgName,
-						d.pid as parentId,
-						date_format( now( ), '%Y' ) as yearId,
-						date_format( now( ), '%Y%m' ) as monthId,
-						ed.DAILY_TYPE,
-						(CASE WHEN ed.DAILY_TYPE='10' THEN 'party'
-									WHEN ed.DAILY_TYPE='20' THEN 'union'
-									WHEN ed.DAILY_TYPE='30' THEN 'voluntaryservice' end) as type,
-						ed.MEET_TYPE as meetCategoryId,
-						me.RESOURCE_LABEL as meetCategoryName,
-						count(ed.id) as organizeCount,
-						IFNULL(sum(ed.JOIN_NUM),0) as joinUserCount
-			FROM esua_epdc_admin.sys_dept d
-				left join (select  id,
-													 DAILY_TYPE,
-													 if(DAILY_TYPE='30','30',MEET_TYPE) as MEET_TYPE,
-													 DEPT_ID,
-													 JOIN_NUM,
-													 DEL_FLAG
-										from esua_epdc_workrecord.epdc_daily_record_info
-										where date_format( CREATED_TIME, '%Y-%m' ) = date_format( now( ), '%Y-%m' ) )ed on ed.DEPT_ID=d.id
-				left join esua_epdc_workrecord.epdc_resources_dictionary me on me.RESOURCE_CODE=ed.MEET_TYPE
-			WHERE d.DEL_FLAG=0
-						and ed.DEL_FLAG=0
-						and d.type_key='community_party'
-						and d.id not in ('1191534129122230274','1191534416067149825','1191535301279203329','1191535501527859202',
+        union all
+            select  d.id as orgId,
+                        d.name as orgName,
+                        d.pid as parentId,
+                        date_format( date_add( now( ), INTERVAL - 1 day), '%Y' ) as yearId,
+                        date_format( date_add( now( ), INTERVAL - 1 day), '%Y%m' ) as monthId,
+                        ed.DAILY_TYPE,
+                        (CASE WHEN ed.DAILY_TYPE='10' THEN 'party'
+                                    WHEN ed.DAILY_TYPE='20' THEN 'union'
+                                    WHEN ed.DAILY_TYPE='30' THEN 'voluntaryservice' end) as type,
+                        ed.MEET_TYPE as meetCategoryId,
+                        me.RESOURCE_LABEL as meetCategoryName,
+                        count(ed.id) as organizeCount,
+                        IFNULL(sum(ed.JOIN_NUM),0) as joinUserCount
+            FROM esua_epdc_admin.sys_dept d
+                left join (select  id,
+                                                     DAILY_TYPE,
+                                                     if(DAILY_TYPE='30','30',MEET_TYPE) as MEET_TYPE,
+                                                     DEPT_ID,
+                                                     JOIN_NUM,
+                                                     DEL_FLAG
+                                        from esua_epdc_workrecord.epdc_daily_record_info
+                                        where date_format( CREATED_TIME, '%Y-%m' ) = date_format( date_add( now( ), INTERVAL - 1 day), '%Y-%m' ) )ed on ed.DEPT_ID=d.id
+                left join esua_epdc_workrecord.epdc_resources_dictionary me on me.RESOURCE_CODE=ed.MEET_TYPE
+            WHERE d.DEL_FLAG=0
+                        and ed.DEL_FLAG=0
+                        and d.type_key='community_party'
+                        and d.id not in ('1191534129122230274','1191534416067149825','1191535301279203329','1191535501527859202',
 '1191535697380884481','1192004624745586689','1230704850994528257',
 '1201319745506598913','1201687651826360321','1201689212329746433')
-			group by ed.DEPT_ID,date_format( now( ), '%Y%m' ),ed.DAILY_TYPE,ed.MEET_TYPE)community
-		group by community.orgId,community.monthId,community.DAILY_TYPE,community.meetCategoryId
+            group by ed.DEPT_ID,date_format( now( ), '%Y%m' ),ed.DAILY_TYPE,ed.MEET_TYPE)community
+        group by community.orgId,community.monthId,community.DAILY_TYPE,community.meetCategoryId
 
 union all -- 街道
 
-	select  street.orgId,
-						street.orgName,
-						street.parentId,
-						'agency' as orgType,
-						street.yearId,
-						street.monthId,
-						street.type,
-						street.meetCategoryId,
-						street.meetCategoryName,
-						SUM(street.organizeCount) AS organizeCount,
-						SUM(street.joinUserCount) AS joinUserCount,
-						IFNULL(round(SUM(street.joinUserCount)/SUM(street.organizeCount),0),0) as averageJoinUserCount
-			from
-			(select  st.id as orgId,
-						st.name as orgName,
-						st.pid as parentId,
-						date_format( now( ), '%Y' ) as yearId,
-						date_format( now( ), '%Y%m' ) as monthId,
-						ed.DAILY_TYPE,
-						(CASE WHEN ed.DAILY_TYPE='10' THEN 'party'
-									WHEN ed.DAILY_TYPE='20' THEN 'union'
-									WHEN ed.DAILY_TYPE='30' THEN 'voluntaryservice' end) as type,
-						ed.MEET_TYPE as meetCategoryId,
-						me.RESOURCE_LABEL as meetCategoryName,
-						count(ed.id) as organizeCount,
-						IFNULL(sum(ed.JOIN_NUM),0) as joinUserCount
-			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  id,
-													 DAILY_TYPE,
-													 if(DAILY_TYPE='30','30',MEET_TYPE) as MEET_TYPE,
-													 DEPT_ID,
-													 JOIN_NUM,
-													 DEL_FLAG
-										from esua_epdc_workrecord.epdc_daily_record_info
-										where date_format( CREATED_TIME, '%Y-%m' ) = date_format( now( ), '%Y-%m' ) )ed on ed.DEPT_ID=gr.id
-				left join esua_epdc_workrecord.epdc_resources_dictionary me on me.RESOURCE_CODE=ed.MEET_TYPE
-			WHERE gr.DEL_FLAG=0
-						and co.DEL_FLAG=0
-						and ed.DEL_FLAG=0
-						and st.DEL_FLAG=0
-						and st.type_key='street_party'
-						and st.id not in ('1191534129122230274','1191534416067149825','1191535301279203329','1191535501527859202',
+    select  street.orgId,
+                        street.orgName,
+                        street.parentId,
+                        'agency' as orgType,
+                        street.yearId,
+                        street.monthId,
+                        street.type,
+                        street.meetCategoryId,
+                        street.meetCategoryName,
+                        SUM(street.organizeCount) AS organizeCount,
+                        SUM(street.joinUserCount) AS joinUserCount,
+                        IFNULL(round(SUM(street.joinUserCount)/SUM(street.organizeCount),0),0) as averageJoinUserCount
+            from
+            (select  st.id as orgId,
+                        st.name as orgName,
+                        st.pid as parentId,
+                        date_format( date_add( now( ), INTERVAL - 1 day), '%Y' ) as yearId,
+                        date_format( date_add( now( ), INTERVAL - 1 day), '%Y%m' ) as monthId,
+                        ed.DAILY_TYPE,
+                        (CASE WHEN ed.DAILY_TYPE='10' THEN 'party'
+                                    WHEN ed.DAILY_TYPE='20' THEN 'union'
+                                    WHEN ed.DAILY_TYPE='30' THEN 'voluntaryservice' end) as type,
+                        ed.MEET_TYPE as meetCategoryId,
+                        me.RESOURCE_LABEL as meetCategoryName,
+                        count(ed.id) as organizeCount,
+                        IFNULL(sum(ed.JOIN_NUM),0) as joinUserCount
+            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  id,
+                                                     DAILY_TYPE,
+                                                     if(DAILY_TYPE='30','30',MEET_TYPE) as MEET_TYPE,
+                                                     DEPT_ID,
+                                                     JOIN_NUM,
+                                                     DEL_FLAG
+                                        from esua_epdc_workrecord.epdc_daily_record_info
+                                        where date_format( CREATED_TIME, '%Y-%m' ) = date_format( date_add( now( ), INTERVAL - 1 day), '%Y-%m' ) )ed on ed.DEPT_ID=gr.id
+                left join esua_epdc_workrecord.epdc_resources_dictionary me on me.RESOURCE_CODE=ed.MEET_TYPE
+            WHERE gr.DEL_FLAG=0
+                        and co.DEL_FLAG=0
+                        and ed.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,date_format( now( ), '%Y%m' ),ed.DAILY_TYPE,ed.MEET_TYPE
+            group by st.id,date_format( now( ), '%Y%m' ),ed.DAILY_TYPE,ed.MEET_TYPE
 
-		union all
+        union all
 
-			select  d.id as orgId,
-						d.name as orgName,
-						d.pid as parentId,
-						date_format( now( ), '%Y' ) as yearId,
-						date_format( now( ), '%Y%m' ) as monthId,
-						ed.DAILY_TYPE,
-						(CASE WHEN ed.DAILY_TYPE='10' THEN 'party'
-									WHEN ed.DAILY_TYPE='20' THEN 'union'
-									WHEN ed.DAILY_TYPE='30' THEN 'voluntaryservice' end) as type,
-						ed.MEET_TYPE as meetCategoryId,
-						me.RESOURCE_LABEL as meetCategoryName,
-						count(ed.id) as organizeCount,
-						IFNULL(sum(ed.JOIN_NUM),0) as joinUserCount
-			FROM esua_epdc_admin.sys_dept d
-				left join (select  id,
-													 DAILY_TYPE,
-													 if(DAILY_TYPE='30','30',MEET_TYPE) as MEET_TYPE,
-													 DEPT_ID,
-													 JOIN_NUM,
-													 DEL_FLAG
-										from esua_epdc_workrecord.epdc_daily_record_info
-										where date_format( CREATED_TIME, '%Y-%m' ) = date_format( now( ), '%Y-%m' ) )ed on ed.DEPT_ID=d.id
-				left join esua_epdc_workrecord.epdc_resources_dictionary me on me.RESOURCE_CODE=ed.MEET_TYPE
-			WHERE d.DEL_FLAG=0
-						and ed.DEL_FLAG=0
-						and d.type_key='street_party'
-						and d.id not in ('1191534129122230274','1191534416067149825','1191535301279203329','1191535501527859202',
+            select  d.id as orgId,
+                        d.name as orgName,
+                        d.pid as parentId,
+                        date_format( date_add( now( ), INTERVAL - 1 day), '%Y' ) as yearId,
+                        date_format( date_add( now( ), INTERVAL - 1 day), '%Y%m' ) as monthId,
+                        ed.DAILY_TYPE,
+                        (CASE WHEN ed.DAILY_TYPE='10' THEN 'party'
+                                    WHEN ed.DAILY_TYPE='20' THEN 'union'
+                                    WHEN ed.DAILY_TYPE='30' THEN 'voluntaryservice' end) as type,
+                        ed.MEET_TYPE as meetCategoryId,
+                        me.RESOURCE_LABEL as meetCategoryName,
+                        count(ed.id) as organizeCount,
+                        IFNULL(sum(ed.JOIN_NUM),0) as joinUserCount
+            FROM esua_epdc_admin.sys_dept d
+                left join (select  id,
+                                                     DAILY_TYPE,
+                                                     if(DAILY_TYPE='30','30',MEET_TYPE) as MEET_TYPE,
+                                                     DEPT_ID,
+                                                     JOIN_NUM,
+                                                     DEL_FLAG
+                                        from esua_epdc_workrecord.epdc_daily_record_info
+                                        where date_format( CREATED_TIME, '%Y-%m' ) = date_format( date_add( now( ), INTERVAL - 1 day), '%Y-%m' ) )ed on ed.DEPT_ID=d.id
+                left join esua_epdc_workrecord.epdc_resources_dictionary me on me.RESOURCE_CODE=ed.MEET_TYPE
+            WHERE d.DEL_FLAG=0
+                        and ed.DEL_FLAG=0
+                        and d.type_key='street_party'
+                        and d.id not in ('1191534129122230274','1191534416067149825','1191535301279203329','1191535501527859202',
 '1191535697380884481','1192004624745586689','1230704850994528257',
 '1201319745506598913','1201687651826360321','1201689212329746433')
-			group by ed.DEPT_ID,date_format( now( ), '%Y%m' ),ed.DAILY_TYPE,ed.MEET_TYPE)street
-		group by street.orgId,street.monthId,street.DAILY_TYPE,street.meetCategoryId
+            group by ed.DEPT_ID,date_format( now( ), '%Y%m' ),ed.DAILY_TYPE,ed.MEET_TYPE)street
+        group by street.orgId,street.monthId,street.DAILY_TYPE,street.meetCategoryId
 
 union all -- 市北区
 
-		select  city.orgId,
-						city.orgName,
-						city.parentId,
-						'agency' as orgType,
-						city.yearId,
-						city.monthId,
-						city.type,
-						city.meetCategoryId,
-						city.meetCategoryName,
-						SUM(city.organizeCount) AS organizeCount,
-						SUM(city.joinUserCount) AS joinUserCount,
-						IFNULL(round(SUM(city.joinUserCount)/SUM(city.organizeCount),0),0) as averageJoinUserCount
-			from
-			(select  city.id as orgId,
-						city.name as orgName,
-						city.pid as parentId,
-						date_format( now( ), '%Y' ) as yearId,
-						date_format( now( ), '%Y%m' ) as monthId,
-						ed.DAILY_TYPE,
-						(CASE WHEN ed.DAILY_TYPE='10' THEN 'party'
-									WHEN ed.DAILY_TYPE='20' THEN 'union'
-									WHEN ed.DAILY_TYPE='30' THEN 'voluntaryservice' end) as type,
-						ed.MEET_TYPE as meetCategoryId,
-						me.RESOURCE_LABEL as meetCategoryName,
-						count(ed.id) as organizeCount,
-						IFNULL(sum(ed.JOIN_NUM),0) as joinUserCount
-			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  id,
-													 DAILY_TYPE,
-													 if(DAILY_TYPE='30','30',MEET_TYPE) as MEET_TYPE,
-													 DEPT_ID,
-													 JOIN_NUM,
-													 DEL_FLAG
-										from esua_epdc_workrecord.epdc_daily_record_info
-										where date_format( CREATED_TIME, '%Y-%m' ) = date_format( now( ), '%Y-%m' ) )ed on ed.DEPT_ID=gr.id
-				left join esua_epdc_workrecord.epdc_resources_dictionary me on me.RESOURCE_CODE=ed.MEET_TYPE
-			WHERE gr.DEL_FLAG=0
-						and co.DEL_FLAG=0
-						and ed.DEL_FLAG=0
-						and st.DEL_FLAG=0
-						and city.type_key='district_party' and city.party_code='shibei'
-			group by city.id,date_format( now( ), '%Y%m' ),ed.DAILY_TYPE,ed.MEET_TYPE
+        select  city.orgId,
+                        city.orgName,
+                        city.parentId,
+                        'agency' as orgType,
+                        city.yearId,
+                        city.monthId,
+                        city.type,
+                        city.meetCategoryId,
+                        city.meetCategoryName,
+                        SUM(city.organizeCount) AS organizeCount,
+                        SUM(city.joinUserCount) AS joinUserCount,
+                        IFNULL(round(SUM(city.joinUserCount)/SUM(city.organizeCount),0),0) as averageJoinUserCount
+            from
+            (select  city.id as orgId,
+                        city.name as orgName,
+                        city.pid as parentId,
+                        date_format( date_add( now( ), INTERVAL - 1 day), '%Y' ) as yearId,
+                        date_format( date_add( now( ), INTERVAL - 1 day), '%Y%m' ) as monthId,
+                        ed.DAILY_TYPE,
+                        (CASE WHEN ed.DAILY_TYPE='10' THEN 'party'
+                                    WHEN ed.DAILY_TYPE='20' THEN 'union'
+                                    WHEN ed.DAILY_TYPE='30' THEN 'voluntaryservice' end) as type,
+                        ed.MEET_TYPE as meetCategoryId,
+                        me.RESOURCE_LABEL as meetCategoryName,
+                        count(ed.id) as organizeCount,
+                        IFNULL(sum(ed.JOIN_NUM),0) as joinUserCount
+            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  id,
+                                                     DAILY_TYPE,
+                                                     if(DAILY_TYPE='30','30',MEET_TYPE) as MEET_TYPE,
+                                                     DEPT_ID,
+                                                     JOIN_NUM,
+                                                     DEL_FLAG
+                                        from esua_epdc_workrecord.epdc_daily_record_info
+                                        where date_format( CREATED_TIME, '%Y-%m' ) = date_format( date_add( now( ), INTERVAL - 1 day), '%Y-%m' ) )ed on ed.DEPT_ID=gr.id
+                left join esua_epdc_workrecord.epdc_resources_dictionary me on me.RESOURCE_CODE=ed.MEET_TYPE
+            WHERE gr.DEL_FLAG=0
+                        and co.DEL_FLAG=0
+                        and ed.DEL_FLAG=0
+                        and st.DEL_FLAG=0
+                        and city.type_key='district_party' and city.party_code='shibei'
+            group by city.id,date_format( now( ), '%Y%m' ),ed.DAILY_TYPE,ed.MEET_TYPE
+
+        union all
+
+            select  d.id as orgId,
+                        d.name as orgName,
+                        d.pid as parentId,
+                        date_format( date_add( now( ), INTERVAL - 1 day), '%Y' ) as yearId,
+                        date_format( date_add( now( ), INTERVAL - 1 day), '%Y%m' ) as monthId,
+                        ed.DAILY_TYPE,
+                        (CASE WHEN ed.DAILY_TYPE='10' THEN 'party'
+                                    WHEN ed.DAILY_TYPE='20' THEN 'union'
+                                    WHEN ed.DAILY_TYPE='30' THEN 'voluntaryservice' end) as type,
+                        ed.MEET_TYPE as meetCategoryId,
+                        me.RESOURCE_LABEL as meetCategoryName,
+                        count(ed.id) as organizeCount,
+                        IFNULL(sum(ed.JOIN_NUM),0) as joinUserCount
+            FROM esua_epdc_admin.sys_dept d
+                left join (select  id,
+                                                     DAILY_TYPE,
+                                                     if(DAILY_TYPE='30','30',MEET_TYPE) as MEET_TYPE,
+                                                     DEPT_ID,
+                                                     JOIN_NUM,
+                                                     DEL_FLAG
+                                        from esua_epdc_workrecord.epdc_daily_record_info
+                                        where date_format( CREATED_TIME, '%Y-%m' ) = date_format( date_add( now( ), INTERVAL - 1 day), '%Y-%m' ) )ed on ed.DEPT_ID=d.id
+                left join esua_epdc_workrecord.epdc_resources_dictionary me on me.RESOURCE_CODE=ed.MEET_TYPE
+            WHERE d.DEL_FLAG=0
+                        and ed.DEL_FLAG=0
+                        and d.type_key='district_party' and d.party_code='shibei'
+            group by ed.DEPT_ID,date_format( now( ), '%Y%m' ),ed.DAILY_TYPE,ed.MEET_TYPE)city
+        group by city.orgId,city.monthId,city.DAILY_TYPE,city.meetCategoryId
 
-		union all
 
-			select  d.id as orgId,
-						d.name as orgName,
-						d.pid as parentId,
-						date_format( now( ), '%Y' ) as yearId,
-						date_format( now( ), '%Y%m' ) as monthId,
-						ed.DAILY_TYPE,
-						(CASE WHEN ed.DAILY_TYPE='10' THEN 'party'
-									WHEN ed.DAILY_TYPE='20' THEN 'union'
-									WHEN ed.DAILY_TYPE='30' THEN 'voluntaryservice' end) as type,
-						ed.MEET_TYPE as meetCategoryId,
-						me.RESOURCE_LABEL as meetCategoryName,
-						count(ed.id) as organizeCount,
-						IFNULL(sum(ed.JOIN_NUM),0) as joinUserCount
-			FROM esua_epdc_admin.sys_dept d
-				left join (select  id,
-													 DAILY_TYPE,
-													 if(DAILY_TYPE='30','30',MEET_TYPE) as MEET_TYPE,
-													 DEPT_ID,
-													 JOIN_NUM,
-													 DEL_FLAG
-										from esua_epdc_workrecord.epdc_daily_record_info
-										where date_format( CREATED_TIME, '%Y-%m' ) = date_format( now( ), '%Y-%m' ) )ed on ed.DEPT_ID=d.id
-				left join esua_epdc_workrecord.epdc_resources_dictionary me on me.RESOURCE_CODE=ed.MEET_TYPE
-			WHERE d.DEL_FLAG=0
-						and ed.DEL_FLAG=0
-						and d.type_key='district_party' and d.party_code='shibei'
-			group by ed.DEPT_ID,date_format( now( ), '%Y%m' ),ed.DAILY_TYPE,ed.MEET_TYPE)city
-		group by city.orgId,city.monthId,city.DAILY_TYPE,city.meetCategoryId
 
     </select>
     <select id="customergrid" resultType="com.elink.esua.epdc.dto.screen.result.CustomergridResultDTO">
@@ -1587,6 +1595,7 @@ union all -- 市北区
                      '1201689212329746433')
     </select>
     <select id="customeragency" resultType="com.elink.esua.epdc.dto.screen.result.CustomeragencyResultDTO">
+
          select
               sd.ID agencyId,
               sd.NAME agencyName,
@@ -1618,9 +1627,11 @@ union all -- 市北区
                      '1201319745506598913',
                      '1201687651826360321',
                      '1201689212329746433')
+
     </select>
     <select id="publicpartitotaldata" resultType="com.elink.esua.epdc.dto.screen.result.PublicpartitotaldataResultDTO">
 
+
         	SELECT gr.id as orgId,
 				 gr.name as orgName,
 				 gr.pid as parentId,
@@ -1630,7 +1641,7 @@ union all -- 市北区
 				 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
+				DATE_FORMAT(date_add( now( ), INTERVAL - 1 day),'%Y%m%d') as dataEndTime
 	FROM esua_epdc_admin.sys_dept gr
 	left join
 		(select  total.GRID_ID,
@@ -1744,7 +1755,7 @@ UNION ALL
 				 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
+				DATE_FORMAT(date_add( now( ), INTERVAL - 1 day),'%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
@@ -1861,7 +1872,7 @@ union all
 				 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
+				DATE_FORMAT(date_add( now( ), INTERVAL - 1 day),'%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
@@ -1980,7 +1991,7 @@ union all
 				 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
+				DATE_FORMAT(date_add( now( ), INTERVAL - 1 day),'%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
@@ -2090,5 +2101,6 @@ union all
 					and city.type_key='district_party' and city.party_code='shibei'
 		GROUP BY city.id
 
+
     </select>
 </mapper>