【大屏展示】-【基层党建-建设情况数据日期格式化、添加月份分类】-（王童）-2020/8/28

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 ed.DEPT_ID,date_format( now( ), '%Y%m' ),ed.DAILY_TYPE,ed.MEET_TYPE)community
-		group by community.orgId,community.DAILY_TYPE,community.meetCategoryId
+		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 ed.DEPT_ID,date_format( now( ), '%Y%m' ),ed.DAILY_TYPE,ed.MEET_TYPE)street
-		group by street.orgId,street.DAILY_TYPE,street.meetCategoryId
+		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 ed.DEPT_ID,date_format( now( ), '%Y%m' ),ed.DAILY_TYPE,ed.MEET_TYPE)city
-		group by city.orgId,city.DAILY_TYPE,city.meetCategoryId
+		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