From 08ab1e62e16c1f41c2fa55b45989fdba96e72b32 Mon Sep 17 00:00:00 2001 From: zhangfh Date: Fri, 20 Aug 2021 17:29:54 +0800 Subject: [PATCH 1/7] =?UTF-8?q?=E6=A6=86=E5=B1=B1=E9=A1=B9=E7=9B=AE?= =?UTF-8?q?=E4=BB=A3=E7=A0=81=E6=8F=90=E4=BA=A4=20=20=E5=85=9A=E7=BB=84?= =?UTF-8?q?=E7=BB=87=E7=B1=BB=E5=9E=8B=E5=88=97=E8=A1=A8=E6=8E=A5=E5=8F=A3?= =?UTF-8?q?=E5=8F=8A=E5=85=9A=E7=BB=84=E7=BB=87=E6=8E=A5=E5=8F=A3=E5=88=97?= =?UTF-8?q?=E8=A1=A8=E5=A2=9E=E5=8A=A0=E8=BF=94=E5=9B=9E=E5=AD=97=E6=AE=B5?= =?UTF-8?q?=EF=BC=9A=E7=B1=BB=E5=9E=8B=E7=BC=96=E7=A0=81=20=E4=BB=A3?= =?UTF-8?q?=E7=A0=81=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/resources/mapper/screen/EpdcScreenDao.xml | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 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 a29b507..32e8f55 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 @@ -193,6 +193,7 @@ SELECT ot.ID, ot.TYPE_NAME, + ot.TYPE_CODE, COUNT( po.ID ) AS partyOrgNum FROM yushan_esua_epdc_admin.epdc_party_org_type ot @@ -215,7 +216,8 @@ TWO_COMMITTEES, PARTY_MEMBER_NUM, LONGITUDE, - LATITUDE + LATITUDE, + TYPE_CODE FROM yushan_esua_epdc_admin.epdc_party_org WHERE @@ -352,10 +354,13 @@ resultType="com.elink.esua.epdc.dto.analysis.pc.screen.result.EpdcScreenEpidemicCompanyVaccinationStatisticsResultDTO"> SELECT COMPANY, - VACCINATION_NUM + SUM(VACCINATION_NUM) AS vaccinationNum FROM yushan_esua_epdc_analysis.epdc_screen_vaccination_company_statistics WHERE DEL_FLAG = '0' - + GROUP BY + COMPANY + ORDER BY vaccinationNum DESC + @@ -274,9 +263,9 @@ sdi.ACREAGE AS acreage, edi.IMG_URL AS imgUrl, edi.IMG_TYPE AS imgType - FROM sys_dept_info sdi - LEFT JOIN sys_dept sd ON sd.ID = sdi.DEPT_ID - LEFT JOIN 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' @@ -360,7 +349,7 @@ GROUP BY COMPANY ORDER BY vaccinationNum DESC - + + + + + + + + + + + + + + + + + + From f8bf80608ff9c8328e22fdbf0df4ecdf5ecbf2de Mon Sep 17 00:00:00 2001 From: liuchuang <123456> Date: Sat, 21 Aug 2021 13:56:59 +0800 Subject: [PATCH 4/7] =?UTF-8?q?202108=E7=89=88=E5=A4=A7=E5=B1=8F-=E7=BD=91?= =?UTF-8?q?=E6=A0=BC=E6=B2=BB=E7=90=86=E9=A1=B9=E7=9B=AE=E8=AF=A6=E6=83=85?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3=20init?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../screen/controller/EpdcScreenController.java | 9 +++++---- .../epdc/modules/screen/dao/EpdcScreenDao.java | 4 ++-- .../modules/screen/service/EpdcScreenService.java | 4 ++-- .../service/impl/EpdcScreenServiceImpl.java | 6 +++--- .../resources/mapper/screen/EpdcScreenDao.xml | 15 ++++++++++----- 5 files changed, 22 insertions(+), 16 deletions(-) diff --git a/epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/screen/controller/EpdcScreenController.java b/epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/screen/controller/EpdcScreenController.java index 2d01cc3..8ee465d 100644 --- a/epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/screen/controller/EpdcScreenController.java +++ b/epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/screen/controller/EpdcScreenController.java @@ -268,13 +268,14 @@ public class EpdcScreenController { /** * 网格治理项目详情 * - * @param id + * @param formDto * @return com.elink.esua.epdc.commons.tools.utils.Result * @author lc * @since 2021/8/20 19:35 */ - @GetMapping("gridGovernance/itemDetail/{id}") - public Result itemDetail(@PathVariable("id") String id) { - return epdcScreenService.itemDetail(id); + @GetMapping("gridGovernance/itemDetail") + public Result itemDetail(@RequestBody EpdcScreenItemDetailFormDTO formDto) { + ValidatorUtils.validateEntity(formDto); + return epdcScreenService.itemDetail(formDto); } } diff --git a/epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/screen/dao/EpdcScreenDao.java b/epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/screen/dao/EpdcScreenDao.java index 8252293..a9cec0e 100644 --- a/epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/screen/dao/EpdcScreenDao.java +++ b/epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/screen/dao/EpdcScreenDao.java @@ -191,12 +191,12 @@ public interface EpdcScreenDao extends BaseDao * @author lc * @since 2021/8/20 19:35 */ - Result itemDetail(String id); + Result itemDetail(EpdcScreenItemDetailFormDTO formDto); } diff --git a/epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/screen/service/impl/EpdcScreenServiceImpl.java b/epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/screen/service/impl/EpdcScreenServiceImpl.java index 2d54f2b..2d06c8a 100644 --- a/epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/screen/service/impl/EpdcScreenServiceImpl.java +++ b/epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/screen/service/impl/EpdcScreenServiceImpl.java @@ -151,11 +151,11 @@ public class EpdcScreenServiceImpl extends BaseServiceImpl itemDetail(String id) { + public Result itemDetail(EpdcScreenItemDetailFormDTO formDto) { // 获取项目信息、网格员信息 - EpdcScreenItemDetailResultDTO data = baseDao.itemDetailAndGridMan(id); + EpdcScreenItemDetailResultDTO data = baseDao.itemDetailAndGridMan(formDto); // 获取处理进展 - List list = baseDao.screenItemHandleProgress(id); + List list = baseDao.screenItemHandleProgress(data.getId()); data.setHandleProgress(list); return new Result().ok(data); } 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 aea8878..5150c0f 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 @@ -393,7 +393,12 @@ yushan_esua_epdc_events.epdc_item i WHERE i.DEL_FLAG = '0' - AND i.ID = #{id} + + AND i.ID = #{id} + + + AND i.EVENT_ID = #{id} + @@ -419,9 +424,9 @@ itemDept.DEPT_NAME, img.IMG_URL FROM - epdc_item_handle_process hp - LEFT JOIN epdc_item_dept itemDept ON hp.ID = itemDept.ITEM_HANDLE_ID - LEFT JOIN 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 @@ -442,7 +447,7 @@ NULL AS DEPT_NAME, NULL AS IMG_URL FROM - epdc_item item + yushan_esua_epdc_events.epdc_item item WHERE item.DEL_FLAG = '0' AND item.ID = #{id} From f12b8ce4b55aedb2454c4630963044be42830b59 Mon Sep 17 00:00:00 2001 From: zhangfh Date: Sat, 21 Aug 2021 16:19:22 +0800 Subject: [PATCH 5/7] =?UTF-8?q?=E6=A6=86=E5=B1=B1=E9=A1=B9=E7=9B=AE?= =?UTF-8?q?=E4=BB=A3=E7=A0=81=E6=8F=90=E4=BA=A4=20=20=E5=85=9A=E7=BB=84?= =?UTF-8?q?=E7=BB=87=E5=88=97=E8=A1=A8=E8=BF=94=E5=9B=9E=E5=9B=BE=E6=A0=87?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../resources/mapper/screen/EpdcScreenDao.xml | 24 +++++++++++-------- 1 file changed, 14 insertions(+), 10 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 5150c0f..9b1c093 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 @@ -199,18 +199,22 @@ @@ -83,8 +83,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 ( @@ -115,7 +115,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} @@ -137,8 +137,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' @@ -161,8 +161,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 @@ -186,8 +186,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' @@ -210,8 +210,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 @@ -228,8 +228,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' @@ -248,7 +248,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' @@ -268,9 +268,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' @@ -285,7 +285,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' @@ -297,7 +297,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' @@ -308,7 +308,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' @@ -325,7 +325,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 @@ -349,7 +349,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' GROUP BY COMPANY @@ -364,7 +364,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} @@ -375,7 +375,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} @@ -388,14 +388,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' @@ -429,9 +429,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 @@ -452,7 +452,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} @@ -460,4 +460,36 @@ ORDER BY createdTime DESC + + + +