From de41f5c87e1d496841a54b4c5af03c82cde5b49c Mon Sep 17 00:00:00 2001 From: zhangyongzhangyong <2012005003@qq.com> Date: Wed, 8 Sep 2021 13:43:14 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E5=BF=97=E6=84=BF=E6=9C=8D=E5=8A=A1?= =?UTF-8?q?=E3=80=81=E7=A4=BE=E5=8C=BA=E6=9C=8D=E5=8A=A1=EF=BC=8C=E5=88=97?= =?UTF-8?q?=E8=A1=A8=E7=BB=9F=E8=AE=A1=EF=BC=9A=E6=BB=A1=E6=84=8F=E5=BA=A6?= =?UTF-8?q?=20=E6=94=B9=E4=B8=BA=20=20=E5=8F=82=E5=8A=A0=E4=BA=BA=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/mapper/screen/EpdcScreenDao.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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..80b70d1 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 @@ -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' From 8c0440bc73809872e242ad0941fec19d23f801ca Mon Sep 17 00:00:00 2001 From: zhangyongzhangyong <2012005003@qq.com> Date: Wed, 8 Sep 2021 14:19:42 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E6=95=B0=E6=8D=AE=E5=BA=93=E5=90=8D?= =?UTF-8?q?=E7=A7=B0=EF=BC=8C=E6=94=B9=E4=B8=BA=20=E6=B5=8B=E8=AF=95?= =?UTF-8?q?=E5=BA=93=E5=90=8D=E7=A7=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../resources/mapper/screen/EpdcScreenDao.xml | 116 +++++++++--------- 1 file changed, 58 insertions(+), 58 deletions(-) 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 80b70d1..a42fb7b 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 @@ -27,9 +27,9 @@ i.DISTRIBUTE_TIME, IFNULL(e.APPROVE_NUM + e.OPPOSE_NUM + e.COMMENT_NUM, 0) AS attentionNum FROM - esua_epdc_events.epdc_item i - LEFT JOIN esua_epdc_events.epdc_category c ON c.CATEGORY_CODE = i.CATEGORY_CODE - LEFT JOIN esua_epdc_events.epdc_events e ON e.ID = i.EVENT_ID + yushan_esua_epdc_events.epdc_item i + LEFT JOIN yushan_esua_epdc_events.epdc_category c ON c.CATEGORY_CODE = i.CATEGORY_CODE + LEFT JOIN yushan_esua_epdc_events.epdc_events e ON e.ID = i.EVENT_ID WHERE i.DEL_FLAG = '0' ORDER BY @@ -45,8 +45,8 @@ c.CATEGORY_NAME, COUNT(i.ID) AS itemNum FROM - esua_epdc_events.epdc_item i - LEFT JOIN esua_epdc_events.epdc_category c ON c.category_code = i.FIRST_CATEGORY_CODE AND c.del_flag = '0' + yushan_esua_epdc_events.epdc_item i + LEFT JOIN yushan_esua_epdc_events.epdc_category c ON c.category_code = i.FIRST_CATEGORY_CODE AND c.del_flag = '0' WHERE i.DEL_FLAG = '0' GROUP BY @@ -58,7 +58,7 @@ IFNULL(SUM(ITEM_STATE = 0), 0) AS processingNum, IFNULL(SUM(ITEM_STATE = 5 OR ITEM_STATE = 10), 0) AS completedNum FROM - esua_epdc_events.epdc_item + yushan_esua_epdc_events.epdc_item WHERE DEL_FLAG = '0' @@ -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 + yushan_esua_epdc_analysis.epdc_difficult_item di, + yushan_esua_epdc_analysis.epdc_item_difficult_config dc WHERE di.DEL_FLAG = '0' AND ( @@ -104,7 +104,7 @@ SATISFACTION_RATE, AUTONOMY_RATE FROM - esua_epdc_analysis.epdc_screen_governance_ranking + yushan_esua_epdc_analysis.epdc_screen_governance_ranking WHERE DEL_FLAG = '0' AND STATISTIC_TYPE = #{statisticType} @@ -126,8 +126,8 @@ n.CREATED_TIME, n.TOP_FLAG FROM - esua_epdc_news.epdc_notice n - LEFT JOIN esua_epdc_news.epdc_module_type t ON t.id = n.TYPE_ID + yushan_esua_epdc_news.epdc_notice n + LEFT JOIN yushan_esua_epdc_news.epdc_module_type t ON t.id = n.TYPE_ID WHERE n.DEL_FLAG = '0' AND n.NOTICE_RELEASE_STATE = '1' @@ -150,8 +150,8 @@ 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 - LEFT JOIN esua_epdc_analysis.epdc_screen_community_act_statistics a ON a.DEPT_ID = d.id + yushan_esua_epdc_admin.sys_dept d + LEFT JOIN yushan_esua_epdc_analysis.epdc_screen_community_act_statistics a ON a.DEPT_ID = d.id AND a.DEL_FLAG = '0' WHERE d.del_flag = 0 @@ -175,8 +175,8 @@ ot.IMG_URL, COUNT( po.ID ) AS partyOrgNum FROM - esua_epdc_admin.epdc_party_org_type ot - LEFT JOIN esua_epdc_admin.epdc_party_org po ON po.TYPE_CODE = ot.TYPE_CODE + yushan_esua_epdc_admin.epdc_party_org_type ot + LEFT JOIN yushan_esua_epdc_admin.epdc_party_org po ON po.TYPE_CODE = ot.TYPE_CODE AND po.DEL_FLAG = '0' WHERE ot.DEL_FLAG = '0' @@ -199,8 +199,8 @@ po.TYPE_CODE, pot.IMG_URL FROM - esua_epdc_admin.epdc_party_org po - LEFT JOIN esua_epdc_admin.epdc_party_org_type pot ON po.TYPE_CODE = pot.TYPE_CODE + yushan_esua_epdc_admin.epdc_party_org po + LEFT JOIN yushan_esua_epdc_admin.epdc_party_org_type pot ON po.TYPE_CODE = pot.TYPE_CODE WHERE po.DEL_FLAG = '0' AND @@ -218,8 +218,8 @@ ui.PROMISE, ui.SERVICE_AREA FROM - esua_epdc_user.epdc_user_info ui - LEFT JOIN esua_epdc_user.epdc_user u ON u.ID = ui.USER_ID + yushan_esua_epdc_user.epdc_user_info ui + LEFT JOIN yushan_esua_epdc_user.epdc_user u ON u.ID = ui.USER_ID WHERE ui.DEL_FLAG = '0' AND ui.RECOMMEND_FLAG = '1' @@ -237,7 +237,7 @@ IFNULL(SUM( AGE_SIXTY_ONE_SEVENTY ), 0) AS ageSixtyOneSeventy, IFNULL(SUM( AGE_OVER_SEVENTY ), 0) AS ageOverSeventy FROM - esua_epdc_analysis.epdc_screen_party_member_age_statistics + yushan_esua_epdc_analysis.epdc_screen_party_member_age_statistics WHERE DEL_FLAG = '0' @@ -257,9 +257,9 @@ sdi.ACREAGE AS acreage, edi.IMG_URL AS imgUrl, edi.IMG_TYPE AS imgType - FROM esua_epdc_admin.sys_dept_info sdi - LEFT JOIN esua_epdc_admin.sys_dept sd ON sd.ID = sdi.DEPT_ID - LEFT JOIN esua_epdc_admin.epdc_admin_img edi ON edi.REFERENCE_ID = sdi.DEPT_ID + FROM yushan_esua_epdc_admin.sys_dept_info sdi + LEFT JOIN yushan_esua_epdc_admin.sys_dept sd ON sd.ID = sdi.DEPT_ID + LEFT JOIN yushan_esua_epdc_admin.epdc_admin_img edi ON edi.REFERENCE_ID = sdi.DEPT_ID WHERE sd.del_flag = '0' AND sdi.DEL_FLAG = '0' AND edi.DEL_FLAG = '0' @@ -274,7 +274,7 @@ sum(if(LIVE_TYPE='0',PERSON_NUM,0)) as permanentResidenceNum, sum(if(LIVE_TYPE='1',PERSON_NUM,0)) as floatingPopulationNum, sum(if(LIVE_TYPE='2',PERSON_NUM,0)) as overseasPopulationNum - FROM esua_epdc_analysis.epdc_screen_person_live_statistics + FROM yushan_esua_epdc_analysis.epdc_screen_person_live_statistics WHERE DEL_FLAG = '0' @@ -286,7 +286,7 @@ sum(if(HOUSE_TYPE ='2',HOUSE_NUM ,0)) as dormitoryNum, sum(if(HOUSE_TYPE ='3',HOUSE_NUM ,0)) as vacantNum, sum(if(HOUSE_TYPE ='4',HOUSE_NUM ,0)) as otherNum - FROM esua_epdc_analysis.epdc_screen_house_type_statistics + FROM yushan_esua_epdc_analysis.epdc_screen_house_type_statistics WHERE DEL_FLAG = '0' @@ -297,7 +297,7 @@ SUM(ONE_SHOT_NUM) as oneShotNum, SUM(TWO_SHOTS_NUM) as twoShotsNum, SUM(NOT_VACCINATED_NUM) as notVaccinatedNum - FROM esua_epdc_analysis.epdc_screen_vaccination_statistics + FROM yushan_esua_epdc_analysis.epdc_screen_vaccination_statistics WHERE DEL_FLAG = '0' AND TYPE_KEY = #{typeKey} @@ -317,7 +317,7 @@ BEING_VACCINATED_NUM, LONGITUDE, LATITUDE - FROM esua_epdc_analysis.epdc_screen_vaccination_statistics + FROM yushan_esua_epdc_analysis.epdc_screen_vaccination_statistics WHERE DEL_FLAG = '0' ORDER BY @@ -341,7 +341,7 @@ SELECT COMPANY, SUM(VACCINATION_NUM) AS vaccinationNum - FROM esua_epdc_analysis.epdc_screen_vaccination_company_statistics + FROM yushan_esua_epdc_analysis.epdc_screen_vaccination_company_statistics WHERE DEL_FLAG = '0' AND TYPE_KEY = #{typeKey} @@ -359,7 +359,7 @@ SUM(AGE_FORTY_ONE_FIFTY) AS ageFortyOneFifty, SUM(AGE_FIFTY_ONE_SIXTY) AS ageFiftyOneSixty, SUM(AGE_OVER_SIXTY) AS ageOverSixty - FROM esua_epdc_analysis.epdc_screen_vaccination_age_statistics + FROM yushan_esua_epdc_analysis.epdc_screen_vaccination_age_statistics WHERE DEL_FLAG = '0' AND STATISTIC_TYPE = #{statisticType} @@ -373,7 +373,7 @@ SUM(PERMANENT_RESIDENCE_NUM) AS permanentResidenceNum, SUM(FLOATING_POPULATION_NUM) AS floatingPopulationNum, SUM(FOREIGN_POPULATION_NUM) AS foreignPopulationNum - FROM esua_epdc_analysis.epdc_screen_vaccination_person_statistics + FROM yushan_esua_epdc_analysis.epdc_screen_vaccination_person_statistics WHERE DEL_FLAG = '0' AND STATISTIC_TYPE = #{statisticType} @@ -389,14 +389,14 @@ (SELECT GROUP_CONCAT(r.STAFF_NAME) FROM - 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' + yushan_esua_epdc_admin.sys_user u + LEFT JOIN yushan_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 + yushan_esua_epdc_events.epdc_item i WHERE i.DEL_FLAG = '0' @@ -430,9 +430,9 @@ itemDept.DEPT_NAME, img.IMG_URL FROM - esua_epdc_events.epdc_item_handle_process hp - LEFT JOIN esua_epdc_events.epdc_item_dept itemDept ON hp.ID = itemDept.ITEM_HANDLE_ID - LEFT JOIN esua_epdc_events.epdc_img img ON hp.ID = img.REFERENCE_ID + yushan_esua_epdc_events.epdc_item_handle_process hp + LEFT JOIN yushan_esua_epdc_events.epdc_item_dept itemDept ON hp.ID = itemDept.ITEM_HANDLE_ID + LEFT JOIN yushan_esua_epdc_events.epdc_img img ON hp.ID = img.REFERENCE_ID AND IMG_TYPE = 'itemHandle' AND img.DEL_FLAG = '0' WHERE @@ -453,7 +453,7 @@ NULL AS DEPT_NAME, NULL AS IMG_URL FROM - esua_epdc_events.epdc_item item + yushan_esua_epdc_events.epdc_item item WHERE item.DEL_FLAG = '0' AND item.ID = #{id} @@ -463,7 +463,7 @@ @@ -612,9 +612,9 @@ COUNT(i.ID) serviceNum, IFNULL(SUM(TIMESTAMPDIFF(HOUR, i.ACT_START_TIME, i.ACT_END_TIME)), 0) serviceTime, 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' + 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' 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 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 + 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 WHERE i.ACT_TYPE = '1' AND i.DEL_FLAG = '0' AND i.ACT_STATUS = '1' AND vo.is_open = '0' GROUP BY i.ID From 6a6894f6ab0e30a47409769dc0f33d6b8fe205eb Mon Sep 17 00:00:00 2001 From: liuchuang <123456> Date: Wed, 8 Sep 2021 16:57:18 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E5=BA=93=E5=90=8D=E7=A7=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../resources/mapper/screen/EpdcScreenDao.xml | 116 +++++++++--------- epdc-cloud-client-yushan | 2 +- epdc-cloud-commons-yushan | 2 +- 3 files changed, 60 insertions(+), 60 deletions(-) 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 a42fb7b..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 @@ -27,9 +27,9 @@ i.DISTRIBUTE_TIME, IFNULL(e.APPROVE_NUM + e.OPPOSE_NUM + e.COMMENT_NUM, 0) AS attentionNum FROM - yushan_esua_epdc_events.epdc_item i - LEFT JOIN yushan_esua_epdc_events.epdc_category c ON c.CATEGORY_CODE = i.CATEGORY_CODE - LEFT JOIN yushan_esua_epdc_events.epdc_events e ON e.ID = i.EVENT_ID + esua_epdc_events.epdc_item i + LEFT JOIN esua_epdc_events.epdc_category c ON c.CATEGORY_CODE = i.CATEGORY_CODE + LEFT JOIN esua_epdc_events.epdc_events e ON e.ID = i.EVENT_ID WHERE i.DEL_FLAG = '0' ORDER BY @@ -45,8 +45,8 @@ c.CATEGORY_NAME, COUNT(i.ID) AS itemNum FROM - yushan_esua_epdc_events.epdc_item i - LEFT JOIN yushan_esua_epdc_events.epdc_category c ON c.category_code = i.FIRST_CATEGORY_CODE AND c.del_flag = '0' + esua_epdc_events.epdc_item i + LEFT JOIN esua_epdc_events.epdc_category c ON c.category_code = i.FIRST_CATEGORY_CODE AND c.del_flag = '0' WHERE i.DEL_FLAG = '0' GROUP BY @@ -58,7 +58,7 @@ IFNULL(SUM(ITEM_STATE = 0), 0) AS processingNum, IFNULL(SUM(ITEM_STATE = 5 OR ITEM_STATE = 10), 0) AS completedNum FROM - yushan_esua_epdc_events.epdc_item + esua_epdc_events.epdc_item WHERE DEL_FLAG = '0' @@ -72,8 +72,8 @@ di.HANDLE_TOTAL, di.DEPT_TOTAL FROM - yushan_esua_epdc_analysis.epdc_difficult_item di, - yushan_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 ( @@ -104,7 +104,7 @@ SATISFACTION_RATE, AUTONOMY_RATE FROM - yushan_esua_epdc_analysis.epdc_screen_governance_ranking + esua_epdc_analysis.epdc_screen_governance_ranking WHERE DEL_FLAG = '0' AND STATISTIC_TYPE = #{statisticType} @@ -126,8 +126,8 @@ n.CREATED_TIME, n.TOP_FLAG FROM - yushan_esua_epdc_news.epdc_notice n - LEFT JOIN yushan_esua_epdc_news.epdc_module_type t ON t.id = n.TYPE_ID + esua_epdc_news.epdc_notice n + LEFT JOIN esua_epdc_news.epdc_module_type t ON t.id = n.TYPE_ID WHERE n.DEL_FLAG = '0' AND n.NOTICE_RELEASE_STATE = '1' @@ -150,8 +150,8 @@ IFNULL( a.ACT_SHYK_PERSON_NUM, 0 ) AS actShykPersonNum, IFNULL( a.ACT_LJGJ_PERSON_NUM, 0 ) AS actLjgjPersonNum FROM - yushan_esua_epdc_admin.sys_dept d - LEFT JOIN yushan_esua_epdc_analysis.epdc_screen_community_act_statistics a ON a.DEPT_ID = d.id + 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 d.del_flag = 0 @@ -175,8 +175,8 @@ ot.IMG_URL, COUNT( po.ID ) AS partyOrgNum FROM - yushan_esua_epdc_admin.epdc_party_org_type ot - LEFT JOIN yushan_esua_epdc_admin.epdc_party_org po ON po.TYPE_CODE = ot.TYPE_CODE + esua_epdc_admin.epdc_party_org_type ot + LEFT JOIN esua_epdc_admin.epdc_party_org po ON po.TYPE_CODE = ot.TYPE_CODE AND po.DEL_FLAG = '0' WHERE ot.DEL_FLAG = '0' @@ -199,8 +199,8 @@ po.TYPE_CODE, pot.IMG_URL FROM - yushan_esua_epdc_admin.epdc_party_org po - LEFT JOIN yushan_esua_epdc_admin.epdc_party_org_type pot ON po.TYPE_CODE = pot.TYPE_CODE + esua_epdc_admin.epdc_party_org po + LEFT JOIN esua_epdc_admin.epdc_party_org_type pot ON po.TYPE_CODE = pot.TYPE_CODE WHERE po.DEL_FLAG = '0' AND @@ -218,8 +218,8 @@ ui.PROMISE, ui.SERVICE_AREA FROM - yushan_esua_epdc_user.epdc_user_info ui - LEFT JOIN yushan_esua_epdc_user.epdc_user u ON u.ID = ui.USER_ID + esua_epdc_user.epdc_user_info ui + LEFT JOIN esua_epdc_user.epdc_user u ON u.ID = ui.USER_ID WHERE ui.DEL_FLAG = '0' AND ui.RECOMMEND_FLAG = '1' @@ -237,7 +237,7 @@ IFNULL(SUM( AGE_SIXTY_ONE_SEVENTY ), 0) AS ageSixtyOneSeventy, IFNULL(SUM( AGE_OVER_SEVENTY ), 0) AS ageOverSeventy FROM - yushan_esua_epdc_analysis.epdc_screen_party_member_age_statistics + esua_epdc_analysis.epdc_screen_party_member_age_statistics WHERE DEL_FLAG = '0' @@ -257,9 +257,9 @@ sdi.ACREAGE AS acreage, edi.IMG_URL AS imgUrl, edi.IMG_TYPE AS imgType - FROM yushan_esua_epdc_admin.sys_dept_info sdi - LEFT JOIN yushan_esua_epdc_admin.sys_dept sd ON sd.ID = sdi.DEPT_ID - LEFT JOIN yushan_esua_epdc_admin.epdc_admin_img edi ON edi.REFERENCE_ID = sdi.DEPT_ID + FROM esua_epdc_admin.sys_dept_info sdi + LEFT JOIN esua_epdc_admin.sys_dept sd ON sd.ID = sdi.DEPT_ID + LEFT JOIN esua_epdc_admin.epdc_admin_img edi ON edi.REFERENCE_ID = sdi.DEPT_ID WHERE sd.del_flag = '0' AND sdi.DEL_FLAG = '0' AND edi.DEL_FLAG = '0' @@ -274,7 +274,7 @@ sum(if(LIVE_TYPE='0',PERSON_NUM,0)) as permanentResidenceNum, sum(if(LIVE_TYPE='1',PERSON_NUM,0)) as floatingPopulationNum, sum(if(LIVE_TYPE='2',PERSON_NUM,0)) as overseasPopulationNum - FROM yushan_esua_epdc_analysis.epdc_screen_person_live_statistics + FROM esua_epdc_analysis.epdc_screen_person_live_statistics WHERE DEL_FLAG = '0' @@ -286,7 +286,7 @@ sum(if(HOUSE_TYPE ='2',HOUSE_NUM ,0)) as dormitoryNum, sum(if(HOUSE_TYPE ='3',HOUSE_NUM ,0)) as vacantNum, sum(if(HOUSE_TYPE ='4',HOUSE_NUM ,0)) as otherNum - FROM yushan_esua_epdc_analysis.epdc_screen_house_type_statistics + FROM esua_epdc_analysis.epdc_screen_house_type_statistics WHERE DEL_FLAG = '0' @@ -297,7 +297,7 @@ SUM(ONE_SHOT_NUM) as oneShotNum, SUM(TWO_SHOTS_NUM) as twoShotsNum, SUM(NOT_VACCINATED_NUM) as notVaccinatedNum - FROM yushan_esua_epdc_analysis.epdc_screen_vaccination_statistics + FROM esua_epdc_analysis.epdc_screen_vaccination_statistics WHERE DEL_FLAG = '0' AND TYPE_KEY = #{typeKey} @@ -317,7 +317,7 @@ BEING_VACCINATED_NUM, LONGITUDE, LATITUDE - FROM yushan_esua_epdc_analysis.epdc_screen_vaccination_statistics + FROM esua_epdc_analysis.epdc_screen_vaccination_statistics WHERE DEL_FLAG = '0' ORDER BY @@ -341,7 +341,7 @@ SELECT COMPANY, SUM(VACCINATION_NUM) AS vaccinationNum - FROM yushan_esua_epdc_analysis.epdc_screen_vaccination_company_statistics + FROM esua_epdc_analysis.epdc_screen_vaccination_company_statistics WHERE DEL_FLAG = '0' AND TYPE_KEY = #{typeKey} @@ -359,7 +359,7 @@ SUM(AGE_FORTY_ONE_FIFTY) AS ageFortyOneFifty, SUM(AGE_FIFTY_ONE_SIXTY) AS ageFiftyOneSixty, SUM(AGE_OVER_SIXTY) AS ageOverSixty - FROM yushan_esua_epdc_analysis.epdc_screen_vaccination_age_statistics + FROM esua_epdc_analysis.epdc_screen_vaccination_age_statistics WHERE DEL_FLAG = '0' AND STATISTIC_TYPE = #{statisticType} @@ -373,7 +373,7 @@ SUM(PERMANENT_RESIDENCE_NUM) AS permanentResidenceNum, SUM(FLOATING_POPULATION_NUM) AS floatingPopulationNum, SUM(FOREIGN_POPULATION_NUM) AS foreignPopulationNum - FROM yushan_esua_epdc_analysis.epdc_screen_vaccination_person_statistics + FROM esua_epdc_analysis.epdc_screen_vaccination_person_statistics WHERE DEL_FLAG = '0' AND STATISTIC_TYPE = #{statisticType} @@ -389,14 +389,14 @@ (SELECT GROUP_CONCAT(r.STAFF_NAME) FROM - yushan_esua_epdc_admin.sys_user u - LEFT JOIN yushan_esua_epdc_admin.sys_epmet_user_relation r ON r.SYS_USER_ID = u.id AND r.DEL_FLAG = '0' + 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 - yushan_esua_epdc_events.epdc_item i + esua_epdc_events.epdc_item i WHERE i.DEL_FLAG = '0' @@ -430,9 +430,9 @@ itemDept.DEPT_NAME, img.IMG_URL FROM - yushan_esua_epdc_events.epdc_item_handle_process hp - LEFT JOIN yushan_esua_epdc_events.epdc_item_dept itemDept ON hp.ID = itemDept.ITEM_HANDLE_ID - LEFT JOIN yushan_esua_epdc_events.epdc_img img ON hp.ID = img.REFERENCE_ID + esua_epdc_events.epdc_item_handle_process hp + LEFT JOIN esua_epdc_events.epdc_item_dept itemDept ON hp.ID = itemDept.ITEM_HANDLE_ID + LEFT JOIN esua_epdc_events.epdc_img img ON hp.ID = img.REFERENCE_ID AND IMG_TYPE = 'itemHandle' AND img.DEL_FLAG = '0' WHERE @@ -453,7 +453,7 @@ NULL AS DEPT_NAME, NULL AS IMG_URL FROM - yushan_esua_epdc_events.epdc_item item + esua_epdc_events.epdc_item item WHERE item.DEL_FLAG = '0' AND item.ID = #{id} @@ -463,7 +463,7 @@ @@ -612,9 +612,9 @@ COUNT(i.ID) serviceNum, IFNULL(SUM(TIMESTAMPDIFF(HOUR, i.ACT_START_TIME, i.ACT_END_TIME)), 0) serviceTime, IFNULL(SUM(i.SIGNUP_NUM), 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 diff --git a/epdc-cloud-client-yushan b/epdc-cloud-client-yushan index 037ee65..110c38f 160000 --- a/epdc-cloud-client-yushan +++ b/epdc-cloud-client-yushan @@ -1 +1 @@ -Subproject commit 037ee6574bf347ae34d5251735a99c5511d81794 +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