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 0694225..75678e4 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 @@ -280,7 +280,7 @@ public class EpdcScreenController { } /** - * 网格治理-议题详情 + * 网格治理-议题处理进展 * * @param formDto * @return com.elink.esua.epdc.commons.tools.utils.Result> @@ -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> + * @author lc + * @since 2021/8/23 19:02 + */ + @GetMapping("gridGovernance/mapItemList") + public Result> itemList(@RequestBody EpdcScreenItemListFormDTO formDto) { + ValidatorUtils.validateEntity(formDto); + return epdcScreenService.itemList(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 44509cf..0837227 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 @@ -218,6 +218,24 @@ public interface EpdcScreenDao extends BaseDao> + * @author lc + * @since 2021/8/21 17:36 + */ List issueProgress(String issueId); + /** + * 网格治理-项目列表 + * + * @param formDto + * @return com.elink.esua.epdc.commons.tools.utils.Result> + * @author lc + * @since 2021/8/23 19:02 + */ + List itemList(EpdcScreenItemListFormDTO formDto); + } diff --git a/epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/screen/service/EpdcScreenService.java b/epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/screen/service/EpdcScreenService.java index 53ff909..636b0b2 100644 --- a/epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/screen/service/EpdcScreenService.java +++ b/epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/screen/service/EpdcScreenService.java @@ -199,7 +199,7 @@ public interface EpdcScreenService { Result itemDetail(EpdcScreenItemDetailFormDTO formDto); /** - * 网格治理-议题详情 + * 网格治理-议题处理进展 * * @param formDto * @return com.elink.esua.epdc.commons.tools.utils.Result> @@ -207,4 +207,14 @@ public interface EpdcScreenService { * @since 2021/8/21 17:36 */ Result> issueProgress(EpdcScreenIssueProgressFormDTO formDto); + + /** + * 网格治理-项目列表 + * + * @param formDto + * @return com.elink.esua.epdc.commons.tools.utils.Result> + * @author lc + * @since 2021/8/23 19:02 + */ + Result> itemList(EpdcScreenItemListFormDTO 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 4ebdfb5..c7693f0 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 @@ -170,4 +170,10 @@ public class EpdcScreenServiceImpl extends BaseServiceImpl>().ok(data); } + @Override + public Result> itemList(EpdcScreenItemListFormDTO formDto) { + List data = baseDao.itemList(formDto); + 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 842e9de..9901eb2 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 @@ -216,6 +216,7 @@ po.DEL_FLAG = '0' AND pot.DEL_FLAG = '0' + AND pot.`ENABLE` = '1' + + diff --git a/epdc-cloud-client-yushan b/epdc-cloud-client-yushan index 7495db0..3b4c1c3 160000 --- a/epdc-cloud-client-yushan +++ b/epdc-cloud-client-yushan @@ -1 +1 @@ -Subproject commit 7495db02282ff4f08b1135658c54c20b573ef79f +Subproject commit 3b4c1c3076a2ea432cafe8ebe21b64eb74db8a5a