elink-star
/
esua-epdc-cloud
7
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

【大屏展示】-【日期相关调整】-（王童）-2020/9/3

feature/dangjian
Jackwang 5 years ago
parent
e5dbcefd84
commit
4e94f43827
1 changed files with 274 additions and 262 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 78
      esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/resources/mapper/screen/DataStatsScreencollDao.xml

78
esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/resources/mapper/screen/DataStatsScreencollDao.xml
View File

@ -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,12 +1284,14 @@ 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( 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,
@ -1302,7 +1308,7 @@ union all
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
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
@ -1330,8 +1336,8 @@ union all -- 社区
(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,
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'
@ -1349,7 +1355,7 @@ union all -- 社区
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
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
@ -1364,8 +1370,8 @@ 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( 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'
@ -1382,7 +1388,7 @@ union all -- 社区
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
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
@ -1411,8 +1417,8 @@ union all -- 街道
(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,
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'
@ -1431,7 +1437,7 @@ union all -- 街道
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
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
@ -1448,8 +1454,8 @@ 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( 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'
@ -1466,7 +1472,7 @@ union all -- 街道
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
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
@ -1495,8 +1501,8 @@ union all -- 市北区
(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,
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'
@ -1516,7 +1522,7 @@ union all -- 市北区
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
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
@ -1530,8 +1536,8 @@ 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( 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'
@ -1548,7 +1554,7 @@ union all -- 市北区
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
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
@ -1556,6 +1562,8 @@ union all -- 市北区
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
@ -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>

Write Preview
Loading…
Cancel
Save