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 6a67c66..f72f2bf 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 @@ -514,8 +514,8 @@ ug.NICKNAME, ug.USER_AVATAR, COUNT(DISTINCT tc.USER_ID,tc.TOPIC_ID) AS serviceNum - FROM yushan_esua_epdc_group.epdc_user_group ug - LEFT JOIN yushan_esua_epdc_group.epdc_topic_comment tc ON ug.USER_ID = tc.USER_ID + FROM esua_epdc_group.epdc_user_group ug + LEFT JOIN esua_epdc_group.epdc_topic_comment tc ON ug.USER_ID = tc.USER_ID WHERE ug.DEL_FLAG = '0' AND ug.PARTY_MEMBER = '1' AND tc.DEL_FLAG = '0' @@ -547,9 +547,9 @@ tc.CREATED_TIME as contentTime, ug.NICKNAME, ug.MOBILE - FROM yushan_esua_epdc_group.epdc_topic t - LEFT JOIN yushan_esua_epdc_group.epdc_topic_comment tc ON t.ID = tc.TOPIC_ID - LEFT JOIN yushan_esua_epdc_group.epdc_user_group ug ON tc.USER_ID = ug.USER_ID + FROM esua_epdc_group.epdc_topic t + LEFT JOIN esua_epdc_group.epdc_topic_comment tc ON t.ID = tc.TOPIC_ID + LEFT JOIN esua_epdc_group.epdc_user_group ug ON tc.USER_ID = ug.USER_ID WHERE t.DEL_FLAG = '0' AND tc.DEL_FLAG = '0' AND ug.DEL_FLAG = '0' @@ -565,12 +565,12 @@ COUNT(i.ID) serviceNum, IFNULL(SUM(TIMESTAMPDIFF(HOUR, i.ACT_START_TIME, i.ACT_END_TIME)), 0) serviceTime, 0 satisfaction - FROM yushan_esua_epdc_admin.sys_dept d - LEFT JOIN yushan_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' + 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' WHERE d.del_flag = 0 AND d.type_key = 'community_party' - AND d.id NOT IN (SELECT DEPT_ID FROM yushan_esua_epdc_admin.sys_dept_config WHERE DEL_FLAG = 0) + AND d.id NOT IN (SELECT DEPT_ID FROM esua_epdc_admin.sys_dept_config WHERE DEL_FLAG = 0) GROUP BY d.id ORDER BY COUNT(i.ID) DESC, SUM(TIMESTAMPDIFF(HOUR, i.ACT_START_TIME, i.ACT_END_TIME)) DESC @@ -595,12 +595,12 @@ i.ACT_CONTENT actContent, i.SPONSOR sponsor, i.CREATED_TIME - FROM yushan_esua_epdc_mutuality.epdc_act_info i - LEFT JOIN yushan_esua_epdc_admin.sys_dept d ON d.id = i.DEPT_ID AND d.del_flag = 0 + FROM esua_epdc_mutuality.epdc_act_info i + LEFT JOIN esua_epdc_admin.sys_dept d ON d.id = i.DEPT_ID AND d.del_flag = 0 WHERE i.DEL_FLAG = '0' AND i.ACT_STATUS = '1' AND i.ACT_TYPE = '0' AND d.type_key = 'community_party' - AND d.id NOT IN (SELECT DEPT_ID FROM yushan_esua_epdc_admin.sys_dept_config WHERE DEL_FLAG = 0) + AND d.id NOT IN (SELECT DEPT_ID FROM esua_epdc_admin.sys_dept_config WHERE DEL_FLAG = 0) ORDER BY i.CREATED_TIME DESC LIMIT #{pageIndex}, #{pageSize} @@ -612,9 +612,9 @@ COUNT(i.ID) serviceNum, IFNULL(SUM(TIMESTAMPDIFF(HOUR, i.ACT_START_TIME, i.ACT_END_TIME)), 0) serviceTime, 0 satisfaction - FROM yushan_esua_epdc_mutuality.epdc_volunteer_org vo - LEFT JOIN yushan_esua_epdc_mutuality.epdc_vact_org_relation vor ON vo.ID = vor.VOLUNTEER_ORG_ID AND vor.DEL_FLAG = '0' - LEFT JOIN yushan_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' + 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' WHERE vo.del_flag = 0 AND vo.is_open = '0' GROUP BY vo.id @@ -639,9 +639,9 @@ i.REQUIREMENT requirement, i.ACT_CONTENT actContent, i.SPONSOR sponsor - FROM yushan_esua_epdc_mutuality.epdc_act_info i - LEFT JOIN yushan_esua_epdc_mutuality.epdc_vact_org_relation vor ON i.VACT_ID = vor.VACT_ID AND vor.DEL_FLAG = '0' - LEFT JOIN yushan_esua_epdc_mutuality.epdc_volunteer_org vo ON vo.ID = vor.VOLUNTEER_ORG_ID AND vo.del_flag = 0 + FROM esua_epdc_mutuality.epdc_act_info i + LEFT JOIN esua_epdc_mutuality.epdc_vact_org_relation vor ON i.VACT_ID = vor.VACT_ID AND vor.DEL_FLAG = '0' + LEFT JOIN esua_epdc_mutuality.epdc_volunteer_org vo ON vo.ID = vor.VOLUNTEER_ORG_ID AND vo.del_flag = 0 WHERE i.ACT_TYPE = '1' AND i.DEL_FLAG = '0' AND i.ACT_STATUS = '1' AND vo.is_open = '0' GROUP BY i.ID