From cf27e91586330cba3a606359517a982ef672f433 Mon Sep 17 00:00:00 2001 From: wangchao Date: Mon, 18 May 2020 10:45:29 +0800 Subject: [PATCH] =?UTF-8?q?=E5=B1=85=E6=B0=91=E6=AE=B5=E6=94=BF=E5=BA=9C?= =?UTF-8?q?=E7=AB=AF=E5=B7=B2=E5=85=B3=E9=97=AD=E8=AE=AE=E9=A2=98=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../result/ClosedIssueListGovResultDTO.java | 37 +++++++++++++++++++ .../controller/IssueManageController.java | 6 +-- .../src/main/java/com/epmet/dao/IssueDao.java | 12 +++++- .../java/com/epmet/service/IssueService.java | 11 +++++- .../epmet/service/impl/IssueServiceImpl.java | 17 ++++++++- .../src/main/resources/mapper/IssueDao.xml | 20 +++++++++- 6 files changed, 96 insertions(+), 7 deletions(-) create mode 100644 epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/result/ClosedIssueListGovResultDTO.java diff --git a/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/result/ClosedIssueListGovResultDTO.java b/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/result/ClosedIssueListGovResultDTO.java new file mode 100644 index 0000000000..50e5591ec8 --- /dev/null +++ b/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/result/ClosedIssueListGovResultDTO.java @@ -0,0 +1,37 @@ +package com.epmet.dto.result; + +import lombok.Data; + +import java.io.Serializable; + +/** + * @Description 政府端关闭议题列表属性 + * @ClassName ClosedIssueListGovResultDTO + * @Auth wangc + * @Date 2020-05-18 10:33 + */ +@Data +public class ClosedIssueListGovResultDTO implements Serializable { + + private static final long serialVersionUID = 3809252070982486401L; + + /** + * 议题id + * */ + private String issueId; + + /** + * 议题标题 + * */ + private String issueTitle; + + /** + * 议题关闭时间 时间戳 + * */ + private Long closedTime; + + /** + * 解决方案 + * */ + private String closeReason; +} diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/controller/IssueManageController.java b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/controller/IssueManageController.java index 267788393a..71bb7484fb 100644 --- a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/controller/IssueManageController.java +++ b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/controller/IssueManageController.java @@ -126,7 +126,7 @@ public class IssueManageController { } /** - * @Description 获取关闭议题列表 + * @Description 获取关闭议题列表 - 政府端 * @param issueListFormDTO * @return Result> * @author wangc @@ -134,9 +134,9 @@ public class IssueManageController { **/ @PostMapping(value = "closedlist") @RequirePermission(requirePermission = RequirePermissionEnum.WORK_GRASSROOTS_ISSUE_CLOSED_LIST) - public Result> closedList( @RequestBody CommonIssueListFormDTO issueListFormDTO){ + public Result> closedList( @RequestBody CommonIssueListFormDTO issueListFormDTO){ ValidatorUtils.validateEntity(issueListFormDTO); - return new Result>().ok(issueService.closedList(issueListFormDTO)); + return new Result>().ok(issueService.closedListGov(issueListFormDTO)); } /** diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/dao/IssueDao.java b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/dao/IssueDao.java index 93a29f1fa9..a5eeaa6497 100644 --- a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/dao/IssueDao.java +++ b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/dao/IssueDao.java @@ -22,6 +22,7 @@ import com.epmet.dto.IssueDTO; import com.epmet.dto.form.CommonIssueListFormDTO; import com.epmet.dto.form.IssueDetailFormDTO; import com.epmet.dto.form.ShiftProjectListFromDTO; +import com.epmet.dto.result.ClosedIssueListGovResultDTO; import com.epmet.dto.result.ClosedIssueListResultDTO; import com.epmet.dto.result.IssueResultDTO; import com.epmet.dto.result.VotingIssueListResultDTO; @@ -74,11 +75,20 @@ public interface IssueDao extends BaseDao { List selectVotingList(CommonIssueListFormDTO issueListFormDTO); /** - * @Description 查询已关闭议题列表 + * @Description 查询已关闭议题列表 - 居民端 * @param issueListFormDTO * @return List * @author wangc * @date 2020.05.14 13:34 **/ List selectClosedList(CommonIssueListFormDTO issueListFormDTO); + + /** + * @Description 查询已关闭议题列表 - 政府端 + * @param issueListFormDTO + * @return List + * @author wangc + * @date 2020.05.14 13:34 + **/ + List selectClosedListGov(CommonIssueListFormDTO issueListFormDTO); } \ No newline at end of file diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/IssueService.java b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/IssueService.java index daa7c9d499..d0010e9bd7 100644 --- a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/IssueService.java +++ b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/IssueService.java @@ -149,7 +149,7 @@ public interface IssueService extends BaseService { List votingList(CommonIssueListFormDTO issueListForm); /** - * @Description 已关闭列表 + * @Description 已关闭列表 居民端 * @param issueListForm * @return List * @author wangc @@ -188,4 +188,13 @@ public interface IssueService extends BaseService { * @Description 议题管理-议题转项目 **/ void shiftProject(ShiftProjectFormDTO formDTO); + + /** + * @Description 已关闭列表 政府端 + * @param issueListForm + * @return List + * @author wangc + * @date 2020.05.14 10:33 + **/ + List closedListGov(CommonIssueListFormDTO issueListForm); } diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueServiceImpl.java b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueServiceImpl.java index 39770665de..d183de75ac 100644 --- a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueServiceImpl.java +++ b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueServiceImpl.java @@ -274,7 +274,7 @@ public class IssueServiceImpl extends BaseServiceImpl imp } /** - * @Description 已关闭列表 + * @Description 已关闭列表 居民端 * @param issueListForm * @return List * @author wangc @@ -507,4 +507,19 @@ public class IssueServiceImpl extends BaseServiceImpl imp govIssueRedis.subtractWorkGrassrootsIssueRedDotValue(entity.getGridId()); } + /** + * @Description + * @param issueListForm + * @return + * @author wangc + * @date 2020.05.18 10:38 + **/ + @Override + public List closedListGov(CommonIssueListFormDTO issueListForm) { + issueListForm.setPageNo(null == issueListForm.getPageNo() ? NumConstant.ZERO : + (issueListForm.getPageNo() - NumConstant.ONE)*issueListForm.getPageSize() + ); + return baseDao.selectClosedListGov(issueListForm); + } + } diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/resources/mapper/IssueDao.xml b/epmet-module/gov-issue/gov-issue-server/src/main/resources/mapper/IssueDao.xml index 87245109b1..f4cce88a94 100644 --- a/epmet-module/gov-issue/gov-issue-server/src/main/resources/mapper/IssueDao.xml +++ b/epmet-module/gov-issue/gov-issue-server/src/main/resources/mapper/IssueDao.xml @@ -212,7 +212,7 @@ + + \ No newline at end of file