Merge remote-tracking branch 'origin/feature/phaseOne'

epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/screen/controller/EpdcScreenController.java

@@ -280,7 +280,7 @@ public class EpdcScreenController {
     }
 
     /**
-     * 网格治理-议题详情
+     * 网格治理-议题处理进展
      *
      * @param formDto
      * @return com.elink.esua.epdc.commons.tools.utils.Result<java.util.List<com.elink.esua.epdc.dto.analysis.pc.screen.result.EpdcScreenIssueProgressResultDTO>>
@@ -292,4 +292,18 @@ public class EpdcScreenController {
         ValidatorUtils.validateEntity(formDto);
         return epdcScreenService.issueProgress(formDto);
     }
+
+    /**
+     * 网格治理-项目列表
+     *
+     * @param formDto
+     * @return com.elink.esua.epdc.commons.tools.utils.Result<java.util.List<com.elink.esua.epdc.dto.analysis.pc.screen.result.EpdcScreenItemListResultDTO>>
+     * @author lc
+     * @since 2021/8/23 19:02
+     */
+    @GetMapping("gridGovernance/mapItemList")
+    public Result<List<EpdcScreenItemListResultDTO>> itemList(@RequestBody EpdcScreenItemListFormDTO formDto) {
+        ValidatorUtils.validateEntity(formDto);
+        return epdcScreenService.itemList(formDto);
+    }
 }

epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/screen/dao/EpdcScreenDao.java

@@ -218,6 +218,24 @@ public interface EpdcScreenDao extends BaseDao<EpdcScreenGridGovernanceItemResul
      */
     EpdcScreenItemInfoResultDTO selectItemInfo(EpdcScreenIssueProgressFormDTO formDto);
 
+    /**
+     * 网格治理-议题处理进展
+     *
+     * @param issueId
+     * @return com.elink.esua.epdc.commons.tools.utils.Result<java.util.List<com.elink.esua.epdc.dto.analysis.pc.screen.result.EpdcScreenIssueProgressResultDTO>>
+     * @author lc
+     * @since 2021/8/21 17:36
+     */
     List<EpdcScreenIssueProgressResultDTO> issueProgress(String issueId);
 
+    /**
+     * 网格治理-项目列表
+     *
+     * @param formDto
+     * @return com.elink.esua.epdc.commons.tools.utils.Result<java.util.List<com.elink.esua.epdc.dto.analysis.pc.screen.result.EpdcScreenItemListResultDTO>>
+     * @author lc
+     * @since 2021/8/23 19:02
+     */
+    List<EpdcScreenItemListResultDTO> itemList(EpdcScreenItemListFormDTO formDto);
+
 }

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

@@ -199,7 +199,7 @@ public interface EpdcScreenService {
     Result<EpdcScreenItemDetailResultDTO> itemDetail(EpdcScreenItemDetailFormDTO formDto);
 
     /**
-     * 网格治理-议题详情
+     * 网格治理-议题处理进展
      *
      * @param formDto
      * @return com.elink.esua.epdc.commons.tools.utils.Result<java.util.List<com.elink.esua.epdc.dto.analysis.pc.screen.result.EpdcScreenIssueProgressResultDTO>>
@@ -207,4 +207,14 @@ public interface EpdcScreenService {
      * @since 2021/8/21 17:36
      */
     Result<List<EpdcScreenIssueProgressResultDTO>> issueProgress(EpdcScreenIssueProgressFormDTO formDto);
+
+    /**
+     * 网格治理-项目列表
+     *
+     * @param formDto
+     * @return com.elink.esua.epdc.commons.tools.utils.Result<java.util.List<com.elink.esua.epdc.dto.analysis.pc.screen.result.EpdcScreenItemListResultDTO>>
+     * @author lc
+     * @since 2021/8/23 19:02
+     */
+    Result<List<EpdcScreenItemListResultDTO>> itemList(EpdcScreenItemListFormDTO formDto);
 }

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

@@ -170,4 +170,10 @@ public class EpdcScreenServiceImpl extends BaseServiceImpl<EpdcScreenDao, EpdcSc
         return new Result<List<EpdcScreenIssueProgressResultDTO>>().ok(data);
     }
 
+    @Override
+    public Result<List<EpdcScreenItemListResultDTO>> itemList(EpdcScreenItemListFormDTO formDto) {
+        List<EpdcScreenItemListResultDTO> data = baseDao.itemList(formDto);
+        return new Result<List<EpdcScreenItemListResultDTO>>().ok(data);
+    }
+
 }

epdc-cloud-analysis-pc/src/main/resources/mapper/screen/EpdcScreenDao.xml

@@ -216,6 +216,7 @@
             po.DEL_FLAG = '0'
         AND
             pot.DEL_FLAG = '0'
+        AND pot.`ENABLE` = '1'
     </select>
 
     <select id="brightIdentity" resultType="com.elink.esua.epdc.dto.analysis.pc.screen.result.EpdcScreenPartyBuildingBrightIdentityResultDTO">
@@ -492,4 +493,19 @@
         ORDER BY
             hd.CREATED_TIME DESC
     </select>
+
+    <select id="itemList" resultType="com.elink.esua.epdc.dto.analysis.pc.screen.result.EpdcScreenItemListResultDTO">
+        SELECT
+            ID,
+            ITEM_CONTENT,
+            ISSUE_LATITUDE,
+            ISSUE_LONGITUDE
+        FROM
+            yushan_esua_epdc_events.epdc_item
+        WHERE
+            DEL_FLAG = '0'
+        ORDER BY
+            CREATED_TIME DESC
+        LIMIT #{pageIndex}, #{pageSize}
+    </select>
 </mapper>

epdc-cloud-client-yushan

@@ -1 +1 @@
-Subproject commit 7495db02282ff4f08b1135658c54c20b573ef79f
+Subproject commit 3b4c1c3076a2ea432cafe8ebe21b64eb74db8a5a