diff --git a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/resources/mapper/user/UserAnalysisDao.xml b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/resources/mapper/user/UserAnalysisDao.xml index fe8117c1..41410a4e 100644 --- a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/resources/mapper/user/UserAnalysisDao.xml +++ b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/resources/mapper/user/UserAnalysisDao.xml @@ -36,14 +36,13 @@ SELECT count(1) FROM - js_esua_epdc_events.epdc_events + js_esua_epdc_events.epdc_issue WHERE DEL_FLAG = '0' - AND DATE_FORMAT(CREATED_TIME,'%Y-%m-%d') - BETWEEN #{startTime} AND #{endTime} + AND DATE_FORMAT(CREATED_TIME,'%Y-%m-%d') BETWEEN #{startTime} AND #{endTime} - AND GRID_ID =dept.id + AND GRID_ID = dept.id ) AS eventCount FROM js_esua_epdc_admin.sys_dept dept @@ -431,16 +430,9 @@ AND ad.del_flag = 0 ) t0 LEFT JOIN ( - SELECT - eve.ID, - eve.ALL_DEPT_IDS, - eve.DEL_FLAG, - eve.CREATED_TIME - FROM - js_esua_epdc_events.epdc_events eve - LEFT join js_esua_epdc_admin.sys_dept sd ON eve.GRID_ID = sd.ID and sd.del_flag = '0' - WHERE - eve.EVENT_STATE in (0,2) + select eie.ID,eie.ALL_DEPT_IDS,eie.DEL_FLAG,eie.CREATED_TIME from js_esua_epdc_events.epdc_issue eie + left join js_esua_epdc_admin.sys_dept sd on eie.GRID_ID=sd.ID + where sd.del_flag='0' )epen ON find_in_set(t0.id, epen.ALL_DEPT_IDS) AND epen.DEL_FLAG = '0'