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

大屏基础数据上报话题bug修改

feature/screenDataPush
songyunpeng 4 years ago
parent
357ed0a4bb
commit
52a1ccd1f2
1 changed files with 167 additions and 73 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 240
      esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/resources/mapper/screen/ScreenBaseReportDataDao.xml

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

@ -5,73 +5,115 @@
<select id="selectGridTopicStatusList" <select id="selectGridTopicStatusList"
resultType="com.elink.esua.epdc.dto.screen.result.GridTopicStatusResultDTO"> resultType="com.elink.esua.epdc.dto.screen.result.GridTopicStatusResultDTO">
select t.*,
'${customId}' as customerId,
select t.*, DATE_FORMAT(date_add(now(), interval -1 day), '%Y%m%d') as dateId,
'${customId}' as customerId,
DATE_FORMAT(date_add(now(), interval -1 day), '%Y%m%d') as dateId,
CONCAT(DATE_FORMAT(STR_TO_DATE(DATE_FORMAT(date_add(now(), interval -1 day), '%Y-%m-%d'), '%Y'), '%Y'), CONCAT(DATE_FORMAT(STR_TO_DATE(DATE_FORMAT(date_add(now(), interval -1 day), '%Y-%m-%d'), '%Y'), '%Y'),
'W', 'W',
WEEK(STR_TO_DATE(DATE_FORMAT(date_add(now(), interval -1 day), '%Y-%m-%d'), '%Y-%m-%d'))) weekId, WEEK(STR_TO_DATE(DATE_FORMAT(date_add(now(), interval -1 day), '%Y-%m-%d'), '%Y-%m-%d'))) weekId,
DATE_FORMAT(STR_TO_DATE(DATE_FORMAT(date_add(now(), interval -1 day), '%Y-%m-%d'), '%Y'), '%Y') AS yearId, DATE_FORMAT(STR_TO_DATE(DATE_FORMAT(date_add(now(), interval -1 day), '%Y-%m-%d'), '%Y'), '%Y') AS yearId,
CONCAT(DATE_FORMAT(STR_TO_DATE(DATE_FORMAT(date_add(now(), interval -1 day), '%Y-%m-%d'), '%Y'), '%Y'), CONCAT(DATE_FORMAT(STR_TO_DATE(DATE_FORMAT(date_add(now(), interval -1 day), '%Y-%m-%d'), '%Y'), '%Y'),
'Q', 'Q',
QUARTER(STR_TO_DATE(DATE_FORMAT(date_add(now(), interval -1 day), '%Y-%m-%d'), QUARTER(STR_TO_DATE(DATE_FORMAT(date_add(now(), interval -1 day), '%Y-%m-%d'),
'%Y-%m-%d'))) quarterId, '%Y-%m-%d'))) quarterId,
DATE_FORMAT(STR_TO_DATE(DATE_FORMAT(date_add(now(), interval -1 day), '%Y-%m-%d'), '%Y-%m'), '%Y%m') AS monthId DATE_FORMAT(STR_TO_DATE(DATE_FORMAT(date_add(now(), interval -1 day), '%Y-%m-%d'), '%Y-%m'), '%Y%m') AS monthId
from from
( (
select select a.agencyId,
grid.pid as agencyId, a.gridId,
grid.id as gridId, 'discussing' as topicStatusId,
'discussing' as topicStatusId, (a.topicCount + b.issueTotal) as topicCount,
count(et.STATE = 0 or null) as topicCount, ifnull(round(ifnull(a.topicCount, 0) / ifnull(a.topicTotal + b.issueTotal, 0), 2), 0) as topicProportion,
ifnull(round(ifnull(count(et.STATE = 0 or null), 0) / ifnull(count(et.ID), 0),2),0) as topicProportion, (a.topicIncrement + b.issueIncrement) as topicIncrement
ifnull(count(et.STATE = 0 and DATE_FORMAT(et.CREATED_TIME, '%Y-%m-%d') = DATE_FORMAT(date_add(now(), interval -1 day), '%Y-%m-%d') or null),0) as topicIncrement from (
select grid.pid as agencyId,
grid.id as gridId,
count(et.STATE = 0 or null) as topicCount,
ifnull(count(et.ID), 0) as topicTotal,
ifnull(count(et.STATE = 0 and DATE_FORMAT(et.CREATED_TIME, '%Y-%m-%d') =
DATE_FORMAT(date_add(now(), interval -1 day), '%Y-%m-%d') or null),
0) as topicIncrement
from esua_epdc_admin.sys_dept grid from esua_epdc_admin.sys_dept grid
left join esua_epdc_party_group.epdc_party_topic et on et.GRID_ID = grid.ID and et.DEL_FLAG = '0' left join esua_epdc_party_group.epdc_party_topic et on et.GRID_ID = grid.ID and et.DEL_FLAG = '0'
and DATE_FORMAT(et.CREATED_TIME, '%Y-%m-%d') &lt;= DATE_FORMAT(date_add(now(), interval -1 day), '%Y-%m-%d') and DATE_FORMAT(et.CREATED_TIME, '%Y-%m-%d')&lt; DATE_FORMAT(date_add(now(), interval -1 day), '%Y-%m-%d')
where grid.del_flag = '0' where grid.del_flag = '0'
and grid.type_key = 'grid_party' and grid.type_key = 'grid_party'
and grid.id not in (SELECT t.DEPT_ID FROM `esua_epdc_admin`.`sys_dept_config` t WHERE t.DEL_FLAG = '0') and grid.id not in (SELECT t.DEPT_ID FROM `esua_epdc_admin`.`sys_dept_config` t WHERE t.DEL_FLAG = '0')
group by grid.id group by grid.id) a
left join (
select grid.id as gridId,
ifnull(count(et.ID), 0) as issueTotal,
ifnull(count(DATE_FORMAT(et.CREATED_TIME, '%Y-%m-%d') =
DATE_FORMAT(date_add(now(), interval -1 day), '%Y-%m-%d') or null), 0) as issueIncrement
from esua_epdc_admin.sys_dept grid
left join esua_epdc_events.epdc_issue et
on et.GRID_ID = grid.ID and et.DEL_FLAG = '0' and et.IS_PARTY_MEMBER = '1'
and DATE_FORMAT(et.CREATED_TIME, '%Y-%m-%d')&lt;
DATE_FORMAT(date_add(now(), interval -1 day), '%Y-%m-%d')
where grid.del_flag = '0'
and grid.type_key = 'grid_party'
and grid.id not in (SELECT t.DEPT_ID FROM `esua_epdc_admin`.`sys_dept_config` t WHERE t.DEL_FLAG = '0')
group by grid.id) b on a.gridId = b.gridId
union all union all
select select
grid.pid as agencyId, grid.pid as agencyId,
grid.id as gridId, grid.id as gridId,
'hidden' as topicStatusId, 'hidden' as topicStatusId,
count(et.SHIELD_FLAG = 1 or null) as topicCount, 0 as topicCount,
ifnull(round(ifnull(count(et.SHIELD_FLAG = 1 or null), 0) / ifnull(count(et.ID), 0),2),0) as topicProportion, 0 as topicProportion,
ifnull(count(et.SHIELD_FLAG = 1 and DATE_FORMAT(et.CREATED_TIME, '%Y-%m-%d') = DATE_FORMAT(date_add(now(), interval -1 day), '%Y-%m-%d') or null),0) 0 as topicIncrement
from esua_epdc_admin.sys_dept grid from esua_epdc_admin.sys_dept grid
left join esua_epdc_party_group.epdc_party_topic et on et.GRID_ID = grid.ID and et.DEL_FLAG = '0' left join esua_epdc_party_group.epdc_party_topic et on et.GRID_ID = grid.ID and et.DEL_FLAG = '0'
and DATE_FORMAT(et.CREATED_TIME, '%Y-%m-%d') &lt;= DATE_FORMAT(date_add(now(), interval -1 day), '%Y-%m-%d') and DATE_FORMAT(et.CREATED_TIME, '%Y-%m-%d') &lt;= DATE_FORMAT(date_add(now(), interval -1 day), '%Y-%m-%d')
where grid.del_flag = '0' where grid.del_flag = '0'
and grid.type_key = 'grid_party' and grid.type_key = 'grid_party'
and grid.id not in (SELECT t.DEPT_ID FROM `esua_epdc_admin`.`sys_dept_config` t WHERE t.DEL_FLAG = '0') and grid.id not in (SELECT t.DEPT_ID FROM `esua_epdc_admin`.`sys_dept_config` t WHERE t.DEL_FLAG = '0')
group by grid.id group by grid.id
union all union all
select a.agencyId,
a.gridId,
'closed' as topicStatusId,
a.topicCount as topicCount,
ifnull(round(ifnull(a.topicCount, 0) / ifnull(a.topicTotal + b.issueTotal, 0), 2), 0) as topicProportion,
a.topicIncrement
from (
select select
grid.pid as agencyId, grid.pid as agencyId,
grid.id as gridId, grid.id as gridId,
'closed' as topicStatusId, 'closed' as topicStatusId,
count(et.STATE = 20 or null) as topicCount, count(et.STATE = 20 or null) as topicCount,
ifnull(round(ifnull(count(et.STATE = 20 or null), 0) / ifnull(count(et.ID), 0),2),0) as topicProportion, ifnull(count(et.ID), 0) as topicTotal,
ifnull(count(et.STATE = 20 and DATE_FORMAT(et.CREATED_TIME, '%Y-%m-%d') = DATE_FORMAT(date_add(now(), interval -1 day), '%Y-%m-%d') or null),0) as topicIncrement ifnull(count(et.STATE = 20 and DATE_FORMAT(et.CREATED_TIME, '%Y-%m-%d') = DATE_FORMAT(date_add(now(), interval
-1 day), '%Y-%m-%d') or null),0) as topicIncrement
from esua_epdc_admin.sys_dept grid from esua_epdc_admin.sys_dept grid
left join esua_epdc_party_group.epdc_party_topic et on et.GRID_ID = grid.ID and et.DEL_FLAG = '0' left join esua_epdc_party_group.epdc_party_topic et on et.GRID_ID = grid.ID and et.DEL_FLAG = '0'
and DATE_FORMAT(et.CREATED_TIME, '%Y-%m-%d') &lt;= DATE_FORMAT(date_add(now(), interval -1 day), '%Y-%m-%d') and DATE_FORMAT(et.CREATED_TIME, '%Y-%m-%d')&lt; DATE_FORMAT(date_add(now(), interval -1 day), '%Y-%m-%d')
where grid.del_flag = '0' where grid.del_flag = '0'
and grid.type_key = 'grid_party' and grid.type_key = 'grid_party'
and grid.id not in (SELECT t.DEPT_ID FROM `esua_epdc_admin`.`sys_dept_config` t WHERE t.DEL_FLAG = '0') and grid.id not in (SELECT t.DEPT_ID FROM `esua_epdc_admin`.`sys_dept_config` t WHERE t.DEL_FLAG = '0')
group by grid.id group by grid.id)a
left join (
select grid.id as gridId,
ifnull(count(et.ID), 0) as issueTotal,
ifnull(count(DATE_FORMAT(et.CREATED_TIME, '%Y-%m-%d') =
DATE_FORMAT(date_add(now(), interval -1 day), '%Y-%m-%d') or null), 0) as issueIncrement
from esua_epdc_admin.sys_dept grid
left join esua_epdc_events.epdc_issue et
on et.GRID_ID = grid.ID and et.DEL_FLAG = '0' and et.IS_PARTY_MEMBER = '1'
and DATE_FORMAT(et.CREATED_TIME, '%Y-%m-%d')&lt;
DATE_FORMAT(date_add(now(), interval -1 day), '%Y-%m-%d')
where grid.del_flag = '0'
and grid.type_key = 'grid_party'
and grid.id not in (SELECT t.DEPT_ID FROM `esua_epdc_admin`.`sys_dept_config` t WHERE t.DEL_FLAG = '0')
group by grid.id) b on a.gridId = b.gridId
)t )t
</select> </select>
@ -79,73 +121,125 @@
resultType="com.elink.esua.epdc.dto.screen.result.CommunityTopicStatusResultDTO"> resultType="com.elink.esua.epdc.dto.screen.result.CommunityTopicStatusResultDTO">
select t.*, select t.*,
'${customId}' as customerId, '${customId}' as customerId,
DATE_FORMAT(date_add(now(), interval -1 day), '%Y%m%d') as dateId, DATE_FORMAT(date_add(now(), interval -1 day), '%Y%m%d') as dateId,
CONCAT(DATE_FORMAT(STR_TO_DATE(DATE_FORMAT(date_add(now(), interval -1 day), '%Y-%m-%d'), '%Y'), '%Y'), CONCAT(DATE_FORMAT(STR_TO_DATE(DATE_FORMAT(date_add(now(), interval -1 day), '%Y-%m-%d'), '%Y'), '%Y'),
'W', 'W',
WEEK(STR_TO_DATE(DATE_FORMAT(date_add(now(), interval -1 day), '%Y-%m-%d'), '%Y-%m-%d'))) weekId, WEEK(STR_TO_DATE(DATE_FORMAT(date_add(now(), interval -1 day), '%Y-%m-%d'), '%Y-%m-%d'))) weekId,
DATE_FORMAT(STR_TO_DATE(DATE_FORMAT(date_add(now(), interval -1 day), '%Y-%m-%d'), '%Y'), '%Y') AS yearId, DATE_FORMAT(STR_TO_DATE(DATE_FORMAT(date_add(now(), interval -1 day), '%Y-%m-%d'), '%Y'), '%Y') AS yearId,
CONCAT(DATE_FORMAT(STR_TO_DATE(DATE_FORMAT(date_add(now(), interval -1 day), '%Y-%m-%d'), '%Y'), '%Y'), CONCAT(DATE_FORMAT(STR_TO_DATE(DATE_FORMAT(date_add(now(), interval -1 day), '%Y-%m-%d'), '%Y'), '%Y'),
'Q', 'Q',
QUARTER(STR_TO_DATE(DATE_FORMAT(date_add(now(), interval -1 day), '%Y-%m-%d'), QUARTER(STR_TO_DATE(DATE_FORMAT(date_add(now(), interval -1 day), '%Y-%m-%d'),
'%Y-%m-%d'))) quarterId, '%Y-%m-%d'))) quarterId,
DATE_FORMAT(STR_TO_DATE(DATE_FORMAT(date_add(now(), interval -1 day), '%Y-%m-%d'), '%Y-%m'), '%Y%m') AS monthId DATE_FORMAT(STR_TO_DATE(DATE_FORMAT(date_add(now(), interval -1 day), '%Y-%m-%d'), '%Y-%m'), '%Y%m') AS monthId
from from
( (
select select a.agencyId,
sd.id as agencyId, a.pid,
sd.pid as pid, 'discussing' as topicStatusId,
'discussing' as topicStatusId, (a.topicCount + b.issueTotal) as topicCount,
count(et.STATE = 0 or null) as topicCount, ifnull(round(ifnull(a.topicCount, 0) / ifnull(a.topicTotal + b.issueTotal, 0), 2), 0) as topicProportion,
ifnull(round(ifnull(count(et.STATE = 0 or null), 0) / ifnull(count(et.ID), 0),2),0) as topicProportion, (a.topicIncrement + b.issueIncrement) as topicIncrement
ifnull(count(et.STATE = 0 and DATE_FORMAT(et.CREATED_TIME, '%Y-%m-%d') = DATE_FORMAT(date_add(now(), interval -1 day), '%Y-%m-%d') or null),0) as topicIncrement from (
select sd.pid as pid,
sd.id as agencyId,
count(et.STATE = 0 or null) as topicCount,
ifnull(count(et.ID), 0) as topicTotal,
ifnull(count(et.STATE = 0 and DATE_FORMAT(et.CREATED_TIME, '%Y-%m-%d') =
DATE_FORMAT(date_add(now(), interval -1 day), '%Y-%m-%d') or null),
0) as topicIncrement
from esua_epdc_admin.sys_dept sd from esua_epdc_admin.sys_dept sd
left join `esua_epdc_party_group`.epdc_party_topic et on find_in_set(sd.id,et.ALL_DEPT_IDS) and et.DEL_FLAG = '0' left join esua_epdc_party_group.epdc_party_topic et on find_in_set(sd.id,et.ALL_DEPT_IDS) and et.DEL_FLAG =
and DATE_FORMAT(et.CREATED_TIME, '%Y-%m-%d') &lt;= DATE_FORMAT(date_add(now(), interval -1 day), '%Y-%m-%d') '0'
and DATE_FORMAT(et.CREATED_TIME, '%Y-%m-%d')&lt; DATE_FORMAT(date_add(now(), interval -1 day), '%Y-%m-%d')
where sd.del_flag = '0' where sd.del_flag = '0'
and sd.type_key in( 'community_party','street_party') and sd.type_key in( 'community_party','street_party')
and sd.id not in (SELECT t.DEPT_ID FROM `esua_epdc_admin`.`sys_dept_config` t WHERE t.DEL_FLAG = '0') and sd.id not in (SELECT t.DEPT_ID FROM `esua_epdc_admin`.`sys_dept_config` t WHERE t.DEL_FLAG = '0')
group by sd.id group by sd.id) a
left join (
select sd.id as agencyId,
ifnull(count(et.ID), 0) as issueTotal,
ifnull(count(DATE_FORMAT(et.CREATED_TIME, '%Y-%m-%d') =
DATE_FORMAT(date_add(now(), interval -1 day), '%Y-%m-%d') or null), 0) as issueIncrement
from esua_epdc_admin.sys_dept sd
left join esua_epdc_events.epdc_issue et on find_in_set(sd.id,et.ALL_DEPT_IDS)
and et.DEL_FLAG= '0'
and et.IS_PARTY_MEMBER= '1'
and DATE_FORMAT(et.CREATED_TIME, '%Y-%m-%d')&lt; DATE_FORMAT(date_add(now(), interval -1 day), '%Y-%m-%d')
where sd.del_flag= '0'
and sd.type_key in('street_party', 'community_party')
and sd.id not in(
SELECT t.DEPT_ID
FROM `esua_epdc_admin`.`sys_dept_config` t
WHERE t.DEL_FLAG= '0')
group by sd.id) b on a.agencyId = b.agencyId
union all union all
select select
sd.id as agencyId, sd.id as agencyId,
sd.pid as pid, sd.pid as pid,
'hidden' as topicStatusId, 'hidden' as topicStatusId,
count(et.SHIELD_FLAG = 1 or null) as topicCount, 0 as topicCount,
ifnull(round(ifnull(count(et.SHIELD_FLAG = 1 or null), 0) / ifnull(count(et.ID), 0),2),0) as topicProportion, 0 as topicProportion,
ifnull(count(et.SHIELD_FLAG = 1 and DATE_FORMAT(et.CREATED_TIME, '%Y-%m-%d') = DATE_FORMAT(date_add(now(), interval -1 day), '%Y-%m-%d') or null),0) as topicIncrement 0 as topicIncrement
from esua_epdc_admin.sys_dept sd from esua_epdc_admin.sys_dept sd
left join `esua_epdc_party_group`.epdc_party_topic et on find_in_set(sd.id,et.ALL_DEPT_IDS) and et.DEL_FLAG = '0' left join `esua_epdc_party_group`.epdc_party_topic et on find_in_set(sd.id,et.ALL_DEPT_IDS) and et.DEL_FLAG ='0'
and DATE_FORMAT(et.CREATED_TIME, '%Y-%m-%d') &lt;= DATE_FORMAT(date_add(now(), interval -1 day), '%Y-%m-%d') and DATE_FORMAT(et.CREATED_TIME, '%Y-%m-%d') &lt;= DATE_FORMAT(date_add(now(), interval -1 day), '%Y-%m-%d')
where sd.del_flag = '0' where sd.del_flag = '0'
and sd.type_key in( 'community_party','street_party') and sd.type_key in( 'community_party','street_party')
and sd.id not in (SELECT t.DEPT_ID FROM `esua_epdc_admin`.`sys_dept_config` t WHERE t.DEL_FLAG = '0') and sd.id not in (SELECT t.DEPT_ID FROM `esua_epdc_admin`.`sys_dept_config` t WHERE t.DEL_FLAG = '0')
group by sd.id group by sd.id
union all union all
select a.agencyId,
a.pid,
'closed' as topicStatusId,
a.topicCount as topicCount,
ifnull(round(ifnull(a.topicCount, 0) / ifnull(a.topicTotal + b.issueTotal, 0), 2), 0) as topicProportion,
a.topicIncrement
from (
select select
sd.id as agencyId, sd.pid as pid,
sd.pid as pid, sd.id as agencyId,
'closed' as topicStatusId, 'closed' as topicStatusId,
count(et.STATE = 20 or null) as topicCount, count(et.STATE = 20 or null) as topicCount,
ifnull(round(ifnull(count(et.STATE = 20 or null), 0) / ifnull(count(et.ID), 0),2),0) as topicProportion, ifnull(count(et.ID), 0) as topicTotal,
ifnull(count(et.STATE = 20 and DATE_FORMAT(et.CREATED_TIME, '%Y-%m-%d') = DATE_FORMAT(date_add(now(), interval -1 day), '%Y-%m-%d') or null),0) as topicIncrement ifnull(count(et.STATE = 20 and DATE_FORMAT(et.CREATED_TIME, '%Y-%m-%d') = DATE_FORMAT(date_add(now(), interval
-1 day), '%Y-%m-%d') or null),0) as topicIncrement
from esua_epdc_admin.sys_dept sd from esua_epdc_admin.sys_dept sd
left join `esua_epdc_party_group`.epdc_party_topic et on find_in_set(sd.id,et.ALL_DEPT_IDS) and et.DEL_FLAG = '0' left join esua_epdc_party_group.epdc_party_topic et on find_in_set(sd.id,et.ALL_DEPT_IDS) and et.DEL_FLAG = '0'
and DATE_FORMAT(et.CREATED_TIME, '%Y-%m-%d') &lt;= DATE_FORMAT(date_add(now(), interval -1 day), '%Y-%m-%d') and DATE_FORMAT(et.CREATED_TIME, '%Y-%m-%d')&lt; DATE_FORMAT(date_add(now(), interval -1 day), '%Y-%m-%d')
where sd.del_flag = '0' where sd.del_flag = '0'
and sd.type_key in( 'community_party','street_party') and sd.type_key in( 'community_party','street_party')
and sd.id not in (SELECT t.DEPT_ID FROM `esua_epdc_admin`.`sys_dept_config` t WHERE t.DEL_FLAG = '0') and sd.id not in (SELECT t.DEPT_ID FROM `esua_epdc_admin`.`sys_dept_config` t WHERE t.DEL_FLAG = '0')
group by sd.id group by sd.id)a
left join (
select sd.id as agencyId,
ifnull(count(et.ID), 0) as issueTotal,
ifnull(count(DATE_FORMAT(et.CREATED_TIME, '%Y-%m-%d') =
DATE_FORMAT(date_add(now(), interval -1 day), '%Y-%m-%d') or null), 0) as issueIncrement
from esua_epdc_admin.sys_dept sd
left join esua_epdc_events.epdc_issue et on find_in_set(sd.id,et.ALL_DEPT_IDS)
and et.DEL_FLAG= '0'
and et.IS_PARTY_MEMBER= '1'
and DATE_FORMAT(et.CREATED_TIME, '%Y-%m-%d')&lt; DATE_FORMAT(date_add(now(), interval -1 day), '%Y-%m-%d')
where sd.del_flag= '0'
and sd.type_key in('street_party', 'community_party')
and sd.id not in(
SELECT t.DEPT_ID
FROM `esua_epdc_admin`.`sys_dept_config` t
WHERE t.DEL_FLAG= '0')
group by sd.id) b on a.agencyId = b.agencyId
)t; )t;
</select> </select>

Write Preview
Loading…
Cancel
Save