diff --git a/epdc-cloud-analysis-pc/src/main/resources/mapper/screen/EpdcScreenDao.xml b/epdc-cloud-analysis-pc/src/main/resources/mapper/screen/EpdcScreenDao.xml index efec24e..a7dbd1c 100644 --- a/epdc-cloud-analysis-pc/src/main/resources/mapper/screen/EpdcScreenDao.xml +++ b/epdc-cloud-analysis-pc/src/main/resources/mapper/screen/EpdcScreenDao.xml @@ -656,10 +656,10 @@ CAST(CONVERT (COUNT(IF(epps.SCORE < 60, TRUE, NULL)) / CAST(IFNULL(NULLIF(COUNT(eid.ID),0), 1) AS SIGNED) * 100,DECIMAL (18, 2)) AS CHAR(10)) + '%' AS measured, CAST(CONVERT (IFNULL(SUM(epps.SCORE), 0) / CAST(IFNULL(NULLIF(COUNT(eid.ID),0), 1) AS SIGNED),DECIMAL (18, 2)) AS CHAR(10)) AS satisfaction FROM yushan_esua_epdc_events.epdc_item_dept eid - INNER JOIN esua_epdc_admin.sys_user su on eid.DEPT_ID = su.dept_id and su.del_flag = '0' - INNER JOIN esua_epdc_admin.sys_property_user spu on spu.USER_ID = su.id and spu.DEL_FLAG = '0' - INNER JOIN esua_epdc_property.epdc_property_project_score epps on epps.PROJECT_ID = spu.PROJECT_ID and epps.DEL_FLAG = '0' - INNER JOIN esua_epdc_property.epdc_property_project epp on epp.ID = epps.PROJECT_ID and epp.DEL_FLAG = '0' + INNER JOIN yushan_esua_epdc_admin.sys_user su on eid.DEPT_ID = su.dept_id and su.del_flag = '0' + INNER JOIN yushan_esua_epdc_admin.sys_property_user spu on spu.USER_ID = su.id and spu.DEL_FLAG = '0' + INNER JOIN yushan_esua_epdc_property.epdc_property_project_score epps on epps.PROJECT_ID = spu.PROJECT_ID and epps.DEL_FLAG = '0' + INNER JOIN yushan_esua_epdc_property.epdc_property_project epp on epp.ID = epps.PROJECT_ID and epp.DEL_FLAG = '0' WHERE eid.DEL_FLAG = '0' GROUP BY epp.ID ORDER BY COUNT(eid.Id) DESC @@ -674,10 +674,10 @@ ei.ITEM_CONTENT, epp.PROJECT_NAME FROM yushan_esua_epdc_events.epdc_item ei - INNER JOIN esua_epdc_events.epdc_item_dept eid ON ei.ID = eid.ITEM_ID and eid.DEL_FLAG ='0' - INNER JOIN esua_epdc_admin.sys_user su on eid.DEPT_ID = su.dept_id and su.del_flag = '0' - INNER JOIN esua_epdc_admin.sys_property_user spu on spu.USER_ID = su.id and spu.DEL_FLAG = '0' - INNER JOIN esua_epdc_property.epdc_property_project epp on epp.ID = spu.PROJECT_ID and epp.DEL_FLAG = '0' + INNER JOIN yushan_esua_epdc_events.epdc_item_dept eid ON ei.ID = eid.ITEM_ID and eid.DEL_FLAG ='0' + INNER JOIN yushan_esua_epdc_admin.sys_user su on eid.DEPT_ID = su.dept_id and su.del_flag = '0' + INNER JOIN yushan_esua_epdc_admin.sys_property_user spu on spu.USER_ID = su.id and spu.DEL_FLAG = '0' + INNER JOIN yushan_esua_epdc_property.epdc_property_project epp on epp.ID = spu.PROJECT_ID and epp.DEL_FLAG = '0' WHERE ei.DEL_FLAG = '0' GROUP BY epp.ID ORDER BY ei.CREATED_TIME DESC