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 f72f2bf..5709529 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 @@ -72,8 +72,8 @@ di.HANDLE_TOTAL, di.DEPT_TOTAL FROM - esua_epdc_analysis.epdc_difficult_item di, - esua_epdc_analysis.epdc_item_difficult_config dc + esua_epdc_analysis.epdc_difficult_item di, + esua_epdc_analysis.epdc_item_difficult_config dc WHERE di.DEL_FLAG = '0' AND ( @@ -150,7 +150,7 @@ IFNULL( a.ACT_SHYK_PERSON_NUM, 0 ) AS actShykPersonNum, IFNULL( a.ACT_LJGJ_PERSON_NUM, 0 ) AS actLjgjPersonNum FROM - esua_epdc_admin.sys_dept d + esua_epdc_admin.sys_dept d LEFT JOIN esua_epdc_analysis.epdc_screen_community_act_statistics a ON a.DEPT_ID = d.id AND a.DEL_FLAG = '0' WHERE @@ -389,14 +389,14 @@ (SELECT GROUP_CONCAT(r.STAFF_NAME) FROM - esua_epdc_admin.sys_user u + esua_epdc_admin.sys_user u LEFT JOIN esua_epdc_admin.sys_epmet_user_relation r ON r.SYS_USER_ID = u.id AND r.DEL_FLAG = '0' WHERE u.del_flag = 0 AND u.dept_id = i.GRID_ID ORDER BY r.CREATED_TIME) AS gridMan FROM - esua_epdc_events.epdc_item i + esua_epdc_events.epdc_item i WHERE i.DEL_FLAG = '0' @@ -564,7 +564,7 @@ d.`NAME` orgName, COUNT(i.ID) serviceNum, IFNULL(SUM(TIMESTAMPDIFF(HOUR, i.ACT_START_TIME, i.ACT_END_TIME)), 0) serviceTime, - 0 satisfaction + IFNULL(SUM(i.SIGNUP_NUM), 0) satisfaction FROM esua_epdc_admin.sys_dept d LEFT JOIN esua_epdc_mutuality.epdc_act_info i ON d.id = i.DEPT_ID AND i.DEL_FLAG = '0' AND i.ACT_STATUS = '1' AND i.ACT_TYPE = '0' @@ -611,7 +611,7 @@ vo.volunteer_org_name orgName, COUNT(i.ID) serviceNum, IFNULL(SUM(TIMESTAMPDIFF(HOUR, i.ACT_START_TIME, i.ACT_END_TIME)), 0) serviceTime, - 0 satisfaction + IFNULL(SUM(i.SIGNUP_NUM), 0) satisfaction FROM esua_epdc_mutuality.epdc_volunteer_org vo LEFT JOIN esua_epdc_mutuality.epdc_vact_org_relation vor ON vo.ID = vor.VOLUNTEER_ORG_ID AND vor.DEL_FLAG = '0' LEFT JOIN esua_epdc_mutuality.epdc_act_info i ON i.VACT_ID = vor.VACT_ID AND i.ACT_TYPE = '1' AND i.DEL_FLAG = '0' AND i.ACT_STATUS = '1' diff --git a/epdc-cloud-client-yushan b/epdc-cloud-client-yushan index 543266a..110c38f 160000 --- a/epdc-cloud-client-yushan +++ b/epdc-cloud-client-yushan @@ -1 +1 @@ -Subproject commit 543266aa658a12a3a2854e4bba5321d5618fd1f1 +Subproject commit 110c38f14ec395bda689074def3f8a56803e6d04 diff --git a/epdc-cloud-commons-yushan b/epdc-cloud-commons-yushan index 9d7cf7e..128c6a4 160000 --- a/epdc-cloud-commons-yushan +++ b/epdc-cloud-commons-yushan @@ -1 +1 @@ -Subproject commit 9d7cf7e81ccc634751f032f72e5333a90eb40ee2 +Subproject commit 128c6a4bfb8087999b492a6febfdde984623fe3a