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

基础数据bug修改

feature/screenDataPush
songyunpeng 4 years ago
parent
91bcf9184d
commit
733e2cd6a0
1 changed files with 8 additions and 8 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. 16
      esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/resources/mapper/screen/ScreenBaseReportDataDao.xml

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

@ -36,7 +36,7 @@
0) as topicIncrement 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')< DATE_FORMAT(date_add(now(), interval -1 day), '%Y-%m-%d') and DATE_FORMAT(et.CREATED_TIME, '%Y-%m-%d')<= 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')
@ -49,7 +49,7 @@
from esua_epdc_admin.sys_dept grid from esua_epdc_admin.sys_dept grid
left join esua_epdc_events.epdc_issue et 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' 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')< and DATE_FORMAT(et.CREATED_TIME, '%Y-%m-%d')<=
DATE_FORMAT(date_add(now(), interval -1 day), '%Y-%m-%d') 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'
@ -94,7 +94,7 @@
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')< DATE_FORMAT(date_add(now(), interval -1 day), '%Y-%m-%d') and DATE_FORMAT(et.CREATED_TIME, '%Y-%m-%d')<= 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')
@ -107,7 +107,7 @@
from esua_epdc_admin.sys_dept grid from esua_epdc_admin.sys_dept grid
left join esua_epdc_events.epdc_issue et 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' 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')< and DATE_FORMAT(et.CREATED_TIME, '%Y-%m-%d')<=
DATE_FORMAT(date_add(now(), interval -1 day), '%Y-%m-%d') 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'
@ -153,7 +153,7 @@
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 = 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' '0'
and DATE_FORMAT(et.CREATED_TIME, '%Y-%m-%d')< DATE_FORMAT(date_add(now(), interval -1 day), '%Y-%m-%d') and DATE_FORMAT(et.CREATED_TIME, '%Y-%m-%d')<= 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')
@ -167,7 +167,7 @@
left join esua_epdc_events.epdc_issue et on find_in_set(sd.id,et.ALL_DEPT_IDS) 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.DEL_FLAG= '0'
and et.IS_PARTY_MEMBER= '1' and et.IS_PARTY_MEMBER= '1'
and DATE_FORMAT(et.CREATED_TIME, '%Y-%m-%d')< DATE_FORMAT(date_add(now(), interval -1 day), '%Y-%m-%d') and DATE_FORMAT(et.CREATED_TIME, '%Y-%m-%d')<= 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('street_party', 'community_party') and sd.type_key in('street_party', 'community_party')
and sd.id not in( and sd.id not in(
@ -217,7 +217,7 @@
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')< DATE_FORMAT(date_add(now(), interval -1 day), '%Y-%m-%d') and DATE_FORMAT(et.CREATED_TIME, '%Y-%m-%d')<= 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')
@ -231,7 +231,7 @@
left join esua_epdc_events.epdc_issue et on find_in_set(sd.id,et.ALL_DEPT_IDS) 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.DEL_FLAG= '0'
and et.IS_PARTY_MEMBER= '1' and et.IS_PARTY_MEMBER= '1'
and DATE_FORMAT(et.CREATED_TIME, '%Y-%m-%d')< DATE_FORMAT(date_add(now(), interval -1 day), '%Y-%m-%d') and DATE_FORMAT(et.CREATED_TIME, '%Y-%m-%d')<= 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('street_party', 'community_party') and sd.type_key in('street_party', 'community_party')
and sd.id not in( and sd.id not in(

Write Preview
Loading…
Cancel
Save