From 671848d49d7880f3c3d607c2934fff45f3e39ffb Mon Sep 17 00:00:00 2001
From: Jackwang <wt373747285@163.com>
Date: Fri, 28 Aug 2020 17:34:44 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=90=E5=A4=A7=E5=B1=8F=E5=B1=95=E7=A4=BA?=
 =?UTF-8?q?=E3=80=91-=E3=80=90=E5=9F=BA=E5=B1=82=E5=85=9A=E5=BB=BA-?=
 =?UTF-8?q?=E5=BB=BA=E8=AE=BE=E6=83=85=E5=86=B5=E6=95=B0=E6=8D=AE=E6=97=A5?=
 =?UTF-8?q?=E6=9C=9F=E6=A0=BC=E5=BC=8F=E5=8C=96=E3=80=81=E6=B7=BB=E5=8A=A0?=
 =?UTF-8?q?=E6=9C=88=E4=BB=BD=E5=88=86=E7=B1=BB=E3=80=91-=EF=BC=88?=
 =?UTF-8?q?=E7=8E=8B=E7=AB=A5=EF=BC=89-2020/8/28?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mapper/screen/DataStatsScreencollDao.xml  | 36 ++++++++++---------
 1 file changed, 19 insertions(+), 17 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 080678e83..569d5c896 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
@@ -1338,12 +1338,13 @@ 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,
+				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,
@@ -1368,7 +1369,7 @@ union all
 				and d.id not in ('1191534129122230274','1191534416067149825','1191535301279203329','1191535501527859202',
 '1191535697380884481','1192004624745586689','1230704850994528257',
 '1201319745506598913','1201687651826360321','1201689212329746433')
-	group by ed.DEPT_ID,ed.DAILY_TYPE,ed.MEET_TYPE
+	group by ed.DEPT_ID,date_format( now( ), '%Y%m' ),ed.DAILY_TYPE,ed.MEET_TYPE
 
 union all -- 社区
 
@@ -1389,7 +1390,7 @@ union all -- 社区
 						co.name as orgName,
 						co.pid as parentId,
 						date_format( now( ), '%Y' ) as yearId,
-						date_format( now( ), '%Y-%m' ) as monthId,
+						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'
@@ -1416,14 +1417,14 @@ union all -- 社区
 						and co.id not in ('1191534129122230274','1191534416067149825','1191535301279203329','1191535501527859202',
 '1191535697380884481','1192004624745586689','1230704850994528257',
 '1201319745506598913','1201687651826360321','1201689212329746433')
-			group by co.id,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,
+						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'
@@ -1448,8 +1449,8 @@ union all -- 社区
 						and d.id not in ('1191534129122230274','1191534416067149825','1191535301279203329','1191535501527859202',
 '1191535697380884481','1192004624745586689','1230704850994528257',
 '1201319745506598913','1201687651826360321','1201689212329746433')
-			group by ed.DEPT_ID,ed.DAILY_TYPE,ed.MEET_TYPE)community
-		group by community.orgId,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 -- 街道
 
@@ -1470,7 +1471,7 @@ union all -- 街道
 						st.name as orgName,
 						st.pid as parentId,
 						date_format( now( ), '%Y' ) as yearId,
-						date_format( now( ), '%Y-%m' ) as monthId,
+						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'
@@ -1499,7 +1500,7 @@ union all -- 街道
 						and st.id not in ('1191534129122230274','1191534416067149825','1191535301279203329','1191535501527859202',
 '1191535697380884481','1192004624745586689','1230704850994528257',
 '1201319745506598913','1201687651826360321','1201689212329746433')
-			group by st.id,ed.DAILY_TYPE,ed.MEET_TYPE
+			group by st.id,date_format( now( ), '%Y%m' ),ed.DAILY_TYPE,ed.MEET_TYPE
 
 		union all
 
@@ -1507,7 +1508,7 @@ union all -- 街道
 						d.name as orgName,
 						d.pid as parentId,
 						date_format( now( ), '%Y' ) as yearId,
-						date_format( now( ), '%Y-%m' ) as monthId,
+						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'
@@ -1532,8 +1533,8 @@ union all -- 街道
 						and d.id not in ('1191534129122230274','1191534416067149825','1191535301279203329','1191535501527859202',
 '1191535697380884481','1192004624745586689','1230704850994528257',
 '1201319745506598913','1201687651826360321','1201689212329746433')
-			group by ed.DEPT_ID,ed.DAILY_TYPE,ed.MEET_TYPE)street
-		group by street.orgId,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 -- 市北区
 
@@ -1554,7 +1555,7 @@ union all -- 市北区
 						city.name as orgName,
 						city.pid as parentId,
 						date_format( now( ), '%Y' ) as yearId,
-						date_format( now( ), '%Y-%m' ) as monthId,
+						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'
@@ -1581,7 +1582,7 @@ union all -- 市北区
 						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,ed.DAILY_TYPE,ed.MEET_TYPE
+			group by city.id,date_format( now( ), '%Y%m' ),ed.DAILY_TYPE,ed.MEET_TYPE
 
 		union all
 
@@ -1589,7 +1590,7 @@ union all -- 市北区
 						d.name as orgName,
 						d.pid as parentId,
 						date_format( now( ), '%Y' ) as yearId,
-						date_format( now( ), '%Y-%m' ) as monthId,
+						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'
@@ -1611,8 +1612,9 @@ union all -- 市北区
 			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,ed.DAILY_TYPE,ed.MEET_TYPE)city
-		group by city.orgId,city.DAILY_TYPE,city.meetCategoryId
+			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">
          select