From f8bf80608ff9c8328e22fdbf0df4ecdf5ecbf2de Mon Sep 17 00:00:00 2001 From: liuchuang <123456> Date: Sat, 21 Aug 2021 13:56:59 +0800 Subject: [PATCH] =?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}