202108版大屏-网格治理项目详情接口 init

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<com.elink.esua.epdc.dto.item.result.EpdcScreenItemDetailResultDTO>
      * @author lc
      * @since 2021/8/20 19:35
      */
-    @GetMapping("gridGovernance/itemDetail/{id}")
+    @GetMapping("gridGovernance/itemDetail")
-    public Result<EpdcScreenItemDetailResultDTO> itemDetail(@PathVariable("id") String id) {
+    public Result<EpdcScreenItemDetailResultDTO> itemDetail(@RequestBody EpdcScreenItemDetailFormDTO formDto) {
-        return epdcScreenService.itemDetail(id);
+        ValidatorUtils.validateEntity(formDto);
+        return epdcScreenService.itemDetail(formDto);
     }
 }

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<EpdcScreenGridGovernanceItemResul
     /**
      * 获取项目详情和网格员
      *
-     * @param id 项目ID
+     * @param formDto
      * @return com.elink.esua.epdc.dto.analysis.pc.screen.result.EpdcScreenItemDetailResultDTO
      * @author lc
      * @since 2021/8/20 20:38
      */
-    EpdcScreenItemDetailResultDTO itemDetailAndGridMan(String id);
+    EpdcScreenItemDetailResultDTO itemDetailAndGridMan(EpdcScreenItemDetailFormDTO formDto);
 
     /**
      * 项目处理进展

epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/screen/service/EpdcScreenService.java

@@ -191,10 +191,10 @@ public interface EpdcScreenService {
     /**
      * 网格治理项目详情
      *
-     * @param id
+     * @param formDto
      * @return com.elink.esua.epdc.commons.tools.utils.Result<com.elink.esua.epdc.dto.item.result.EpdcScreenItemDetailResultDTO>
      * @author lc
      * @since 2021/8/20 19:35
      */
-    Result<EpdcScreenItemDetailResultDTO> itemDetail(String id);
+    Result<EpdcScreenItemDetailResultDTO> itemDetail(EpdcScreenItemDetailFormDTO formDto);
 }

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<EpdcScreenDao, EpdcSc
     }
 
     @Override
-    public Result<EpdcScreenItemDetailResultDTO> itemDetail(String id) {
+    public Result<EpdcScreenItemDetailResultDTO> itemDetail(EpdcScreenItemDetailFormDTO formDto) {
         // 获取项目信息、网格员信息
-        EpdcScreenItemDetailResultDTO data = baseDao.itemDetailAndGridMan(id);
+        EpdcScreenItemDetailResultDTO data = baseDao.itemDetailAndGridMan(formDto);
         // 获取处理进展
-        List<EpdcScreenItemHandleProgressResultDTO> list = baseDao.screenItemHandleProgress(id);
+        List<EpdcScreenItemHandleProgressResultDTO> list = baseDao.screenItemHandleProgress(data.getId());
         data.setHandleProgress(list);
         return new Result<EpdcScreenItemDetailResultDTO>().ok(data);
     }

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}
+        <if test="idFlag == 0">
+            AND i.ID = #{id}
+        </if>
+        <if test="idFlag == 1">
+            AND i.EVENT_ID = #{id}
+        </if>
     </select>
 
     <resultMap id="itemHandleMap" type="com.elink.esua.epdc.dto.analysis.pc.screen.result.EpdcScreenItemHandleProgressResultDTO">
@@ -419,9 +424,9 @@
             itemDept.DEPT_NAME,
             img.IMG_URL
         FROM
-            epdc_item_handle_process hp
+            yushan_esua_epdc_events.epdc_item_handle_process hp
-                LEFT JOIN epdc_item_dept itemDept ON hp.ID = itemDept.ITEM_HANDLE_ID
+                LEFT JOIN yushan_esua_epdc_events.epdc_item_dept itemDept ON hp.ID = itemDept.ITEM_HANDLE_ID
-                LEFT JOIN epdc_img img ON hp.ID = img.REFERENCE_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}