From 29d19451616651166f8ed1b86bdb1f18b15ce06f Mon Sep 17 00:00:00 2001 From: liuchuang <123456> Date: Mon, 23 Aug 2021 19:39:26 +0800 Subject: [PATCH 1/2] =?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=E5=88=97?= =?UTF-8?q?=E8=A1=A8=E6=8E=A5=E5=8F=A3=20init?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/EpdcScreenController.java | 16 +++++++++++++++- .../epdc/modules/screen/dao/EpdcScreenDao.java | 18 ++++++++++++++++++ .../screen/service/EpdcScreenService.java | 12 +++++++++++- .../service/impl/EpdcScreenServiceImpl.java | 6 ++++++ .../resources/mapper/screen/EpdcScreenDao.xml | 16 ++++++++++++++++ 5 files changed, 66 insertions(+), 2 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 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' + + From 639d6e71afd66aa4a274ab576821c8a58be801e4 Mon Sep 17 00:00:00 2001 From: liuchuang <123456> Date: Mon, 23 Aug 2021 20:13:13 +0800 Subject: [PATCH 2/2] =?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=E5=88=97?= =?UTF-8?q?=E8=A1=A8=E6=8E=A5=E5=8F=A3=20init?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- epdc-cloud-client-yushan | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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