From 8945db5962a365566e10a3a9e3e8f627e9eb9995 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Wed, 18 Nov 2020 17:46:36 +0800 Subject: [PATCH] =?UTF-8?q?=E8=AE=AE=E9=A2=98=E5=AE=A1=E6=A0=B8=EF=BC=9A?= =?UTF-8?q?=E5=B7=A5=E4=BD=9C=E7=AB=AF=E5=88=97=E8=A1=A8=EF=BC=8C=E5=AE=A1?= =?UTF-8?q?=E6=A0=B8=E5=8E=86=E5=8F=B2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/epmet/dto/IssueApplicationDTO.java | 2 +- .../epmet/dto/form/IssueAppQueryFormDTO.java | 12 ++-- .../dto/result/ApplicationHistoryResDTO.java | 44 ++++++++++++++ .../dto/result/IssueApplicationResDTO.java | 41 +++++++++++++ .../epmet/feign/GovIssueOpenFeignClient.java | 44 ++++---------- .../GovIssueOpenFeignClientFallBack.java | 28 ++------- .../IssueApplicationController.java | 9 +-- .../IssueApplicationHistoryController.java | 5 +- .../controller/IssueAuditController.java | 57 +++++++++++++++++++ .../com/epmet/dao/IssueApplicationDao.java | 4 +- .../epmet/dao/IssueApplicationHistoryDao.java | 4 +- .../IssueApplicationHistoryService.java | 3 +- .../service/IssueApplicationService.java | 3 +- .../IssueApplicationHistoryServiceImpl.java | 5 +- .../impl/IssueApplicationServiceImpl.java | 3 +- .../resources/mapper/IssueApplicationDao.xml | 19 ++----- .../mapper/IssueApplicationHistoryDao.xml | 4 +- .../result/ApplicationHistoryResultDTO.java | 2 + .../result/ApplicationListResultDTO.java | 4 +- .../service/impl/GroupIssueServiceImpl.java | 17 ++---- 20 files changed, 203 insertions(+), 107 deletions(-) create mode 100644 epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/result/ApplicationHistoryResDTO.java create mode 100644 epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/result/IssueApplicationResDTO.java create mode 100644 epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/controller/IssueAuditController.java diff --git a/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/IssueApplicationDTO.java b/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/IssueApplicationDTO.java index e41055f158..ed743d720d 100644 --- a/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/IssueApplicationDTO.java +++ b/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/IssueApplicationDTO.java @@ -123,6 +123,6 @@ public class IssueApplicationDTO implements Serializable { /** * 对应issue_application.UPDATED_TIME 对应的秒级时间戳 */ - private Long time; + private Long latestTime; } \ No newline at end of file diff --git a/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/form/IssueAppQueryFormDTO.java b/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/form/IssueAppQueryFormDTO.java index 92a475efb5..b623bc58fd 100644 --- a/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/form/IssueAppQueryFormDTO.java +++ b/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/form/IssueAppQueryFormDTO.java @@ -1,8 +1,8 @@ package com.epmet.dto.form; -import com.epmet.resi.group.dto.group.form.ApplicationListFormDTO; import lombok.Data; +import javax.validation.constraints.NotBlank; import javax.validation.constraints.NotNull; import java.io.Serializable; @@ -14,11 +14,12 @@ import java.io.Serializable; */ @Data public class IssueAppQueryFormDTO implements Serializable { - public interface ApplicationList{} - + public interface Required{} + public interface GovFormDTO{} /** * 网格id */ + @NotBlank(message = "网格id不能为空",groups={GovFormDTO.class}) private String gridId; /** @@ -34,12 +35,13 @@ public class IssueAppQueryFormDTO implements Serializable { /** * 页码 */ - @NotNull(message = "页码不能为空",groups = {ApplicationListFormDTO.ApplicationList.class}) + @NotNull(message = "页码不能为空",groups = {Required.class}) private Integer pageNo; /** * 每页数量 */ - @NotNull(message = "每页数量不能为空",groups = {ApplicationListFormDTO.ApplicationList.class}) + @NotNull(message = "每页数量不能为空",groups = {Required.class}) private Integer pageSize; + } diff --git a/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/result/ApplicationHistoryResDTO.java b/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/result/ApplicationHistoryResDTO.java new file mode 100644 index 0000000000..07ffd0f86a --- /dev/null +++ b/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/result/ApplicationHistoryResDTO.java @@ -0,0 +1,44 @@ +package com.epmet.dto.result; + +import lombok.Data; + +import java.io.Serializable; + +/** + * 工作端：话题转议题申请详情- 审核历史查询 + * + * @author yinzuomei@elink-cn.com + * @date 2020/11/18 17:31 + */ +@Data +public class ApplicationHistoryResDTO implements Serializable { + private static final long serialVersionUID = -2680819847652745103L; + /** + * =id + */ + private String historyId; + + /** + * under_auditing:待审核； + * approved:审核通过； + * rejected:驳回； + */ + private String actionType; + + /** + * createdTime 对应时间戳 + */ + private Long operateTime; + + /** + * 审核时的说明 + */ + private String reason; + + /** + * 工作端人员姓名 + */ + private String staffName; + + +} diff --git a/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/result/IssueApplicationResDTO.java b/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/result/IssueApplicationResDTO.java new file mode 100644 index 0000000000..1b2a91950d --- /dev/null +++ b/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/result/IssueApplicationResDTO.java @@ -0,0 +1,41 @@ +package com.epmet.dto.result; + +import lombok.Data; + +import java.io.Serializable; + +/** + * 待审核|| 已驳回 列表 + * + * @author yinzuomei@elink-cn.com + * @date 2020/11/18 17:22 + */ +@Data +public class IssueApplicationResDTO implements Serializable { + private static final long serialVersionUID = -1452471134719960837L; + /** + * 申请id + */ + private String issueApplicationId; + + /** + * 议题名称 + */ + private String issueTitle; + + /** + * 对应issue_application.UPDATED_TIME 对应的秒级时间戳 + */ + private Long latestTime; + + /** + * 建议 + */ + private String suggestion; + + /** + * 审核状态。under_auditing:审核中,approved:通过，rejected:驳回 + */ + private String applyStatus; + +} diff --git a/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/feign/GovIssueOpenFeignClient.java b/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/feign/GovIssueOpenFeignClient.java index 7a77bc665c..a2ed3fb36e 100644 --- a/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/feign/GovIssueOpenFeignClient.java +++ b/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/feign/GovIssueOpenFeignClient.java @@ -1,34 +1,20 @@ package com.epmet.feign; +import com.epmet.commons.tools.constant.ServiceConstant; import com.epmet.commons.tools.utils.Result; +import com.epmet.dto.IssueDTO; +import com.epmet.dto.IssueSuggestionDTO; +import com.epmet.dto.form.*; +import com.epmet.dto.result.*; +import com.epmet.feign.fallback.GovIssueOpenFeignClientFallBack; +import com.epmet.resi.group.dto.group.form.AllIssueFormDTO; import com.epmet.resi.group.dto.group.form.ApplicationDetailFormDTO; import com.epmet.resi.group.dto.group.form.ApplicationHistoryFormDTO; import com.epmet.resi.group.dto.group.form.ApplicationListFormDTO; import com.epmet.resi.group.dto.group.result.ApplicationDetailResultDTO; import com.epmet.resi.group.dto.group.result.ApplicationHistoryResultDTO; import com.epmet.resi.group.dto.group.result.ApplicationListResultDTO; -import org.springframework.cloud.openfeign.FeignClient; - -import com.epmet.commons.tools.constant.ServiceConstant; -import com.epmet.commons.tools.utils.Result; -import com.epmet.dto.IssueDTO; -import com.epmet.dto.form.MyPartIssuesFormDTO; -import com.epmet.dto.form.MyPubIssuesAuditingFormDTO; -import com.epmet.dto.result.MyPartIssuesResultDTO; -import com.epmet.dto.result.MyPubIssuesAuditingResultDTO; -import com.epmet.commons.tools.utils.Result; -import com.epmet.dto.IssueApplicationDTO; -import com.epmet.dto.IssueApplicationHistoryDTO; -import com.epmet.dto.IssueSuggestionDTO; -import com.epmet.dto.form.IssueAppQueryFormDTO; -import com.epmet.dto.form.IssueApplicationIdFormDTO; -import com.epmet.dto.form.UserIssueSuggestionFormDTO; -import com.epmet.dto.result.SaveIssueSuggestionResultDTO; -import com.epmet.feign.fallback.GovIssueOpenFeignClientFallBack; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestBody; - -import java.util.List; +import com.epmet.resi.group.dto.group.result.*; import com.epmet.resi.mine.dto.from.MyShiftIssueTopicsFormDTO; import com.epmet.resi.mine.dto.result.MyShiftIssueTopicsResultDTO; import org.springframework.cloud.openfeign.FeignClient; @@ -36,16 +22,6 @@ import org.springframework.http.MediaType; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; -import java.util.List; -import com.epmet.resi.group.dto.group.form.AllIssueFormDTO; -import com.epmet.resi.group.dto.group.result.GroupClosedListResultDTO; -import com.epmet.resi.group.dto.group.result.GroupShiftProjectListResultDTO; -import com.epmet.resi.group.dto.group.result.GroupVotingListResultDTO; -import org.springframework.cloud.openfeign.FeignClient; -import org.springframework.http.MediaType; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestBody; - import java.util.List; /** @@ -179,7 +155,7 @@ public interface GovIssueOpenFeignClient { * @Date 2020/11/18 16:40 **/ @PostMapping(value = "/gov/issue/issueapplication/listissueapp",consumes = MediaType.APPLICATION_JSON_VALUE) - Result> listIssueApp(@RequestBody IssueAppQueryFormDTO formDTO); + Result> listIssueApp(@RequestBody IssueAppQueryFormDTO formDTO); /** * @param formDTO @@ -188,5 +164,5 @@ public interface GovIssueOpenFeignClient { * @Date 2020/11/18 17:03 **/ @PostMapping(value = "/gov/issue/issueapplicationhistory/querybyissueapplicationid",consumes = MediaType.APPLICATION_JSON_VALUE) - Result> queryByIssueApplicationId(@RequestBody IssueApplicationIdFormDTO formDTO); + Result> queryByIssueApplicationId(@RequestBody IssueApplicationIdFormDTO formDTO); } diff --git a/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/feign/fallback/GovIssueOpenFeignClientFallBack.java b/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/feign/fallback/GovIssueOpenFeignClientFallBack.java index cfca536da4..bc3bfa8fe6 100644 --- a/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/feign/fallback/GovIssueOpenFeignClientFallBack.java +++ b/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/feign/fallback/GovIssueOpenFeignClientFallBack.java @@ -1,39 +1,23 @@ package com.epmet.feign.fallback; -import com.epmet.commons.tools.constant.ServiceConstant; -import com.epmet.commons.tools.utils.ModuleUtils; -import com.epmet.commons.tools.utils.Result; import com.epmet.commons.tools.constant.ServiceConstant; import com.epmet.commons.tools.utils.ModuleUtils; import com.epmet.commons.tools.utils.Result; import com.epmet.dto.IssueDTO; -import com.epmet.dto.form.MyPartIssuesFormDTO; -import com.epmet.dto.form.MyPubIssuesAuditingFormDTO; -import com.epmet.dto.result.MyPartIssuesResultDTO; -import com.epmet.dto.result.MyPubIssuesAuditingResultDTO; -import com.epmet.commons.tools.constant.ServiceConstant; -import com.epmet.commons.tools.utils.ModuleUtils; -import com.epmet.commons.tools.utils.Result; -import com.epmet.dto.IssueApplicationDTO; -import com.epmet.dto.IssueApplicationHistoryDTO; import com.epmet.dto.IssueSuggestionDTO; -import com.epmet.dto.form.IssueAppQueryFormDTO; -import com.epmet.dto.form.IssueApplicationIdFormDTO; -import com.epmet.dto.form.UserIssueSuggestionFormDTO; -import com.epmet.dto.result.SaveIssueSuggestionResultDTO; +import com.epmet.dto.form.*; +import com.epmet.dto.result.*; import com.epmet.feign.GovIssueOpenFeignClient; +import com.epmet.resi.group.dto.group.form.AllIssueFormDTO; import com.epmet.resi.group.dto.group.form.ApplicationDetailFormDTO; import com.epmet.resi.group.dto.group.form.ApplicationHistoryFormDTO; import com.epmet.resi.group.dto.group.form.ApplicationListFormDTO; import com.epmet.resi.group.dto.group.result.ApplicationDetailResultDTO; import com.epmet.resi.group.dto.group.result.ApplicationHistoryResultDTO; import com.epmet.resi.group.dto.group.result.ApplicationListResultDTO; +import com.epmet.resi.group.dto.group.result.*; import com.epmet.resi.mine.dto.from.MyShiftIssueTopicsFormDTO; import com.epmet.resi.mine.dto.result.MyShiftIssueTopicsResultDTO; -import com.epmet.resi.group.dto.group.form.AllIssueFormDTO; -import com.epmet.resi.group.dto.group.result.GroupClosedListResultDTO; -import com.epmet.resi.group.dto.group.result.GroupShiftProjectListResultDTO; -import com.epmet.resi.group.dto.group.result.GroupVotingListResultDTO; import org.springframework.stereotype.Component; import java.util.List; @@ -147,7 +131,7 @@ public class GovIssueOpenFeignClientFallBack implements GovIssueOpenFeignClient * @Date 2020/11/18 16:40 **/ @Override - public Result> listIssueApp(IssueAppQueryFormDTO formDTO) { + public Result> listIssueApp(IssueAppQueryFormDTO formDTO) { return ModuleUtils.feignConError(ServiceConstant.GOV_ISSUE_SERVER, "listIssueApp", formDTO); } @@ -158,7 +142,7 @@ public class GovIssueOpenFeignClientFallBack implements GovIssueOpenFeignClient * @Date 2020/11/18 17:03 **/ @Override - public Result> queryByIssueApplicationId(IssueApplicationIdFormDTO formDTO) { + public Result> queryByIssueApplicationId(IssueApplicationIdFormDTO formDTO) { return ModuleUtils.feignConError(ServiceConstant.GOV_ISSUE_SERVER, "queryByIssueApplicationId", formDTO); } } diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/controller/IssueApplicationController.java b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/controller/IssueApplicationController.java index dffa1dd82d..8cfafb1287 100644 --- a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/controller/IssueApplicationController.java +++ b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/controller/IssueApplicationController.java @@ -26,6 +26,7 @@ import com.epmet.commons.tools.validator.group.DefaultGroup; import com.epmet.commons.tools.validator.group.UpdateGroup; import com.epmet.dto.IssueApplicationDTO; import com.epmet.dto.form.IssueAppQueryFormDTO; +import com.epmet.dto.result.IssueApplicationResDTO; import com.epmet.resi.group.dto.group.form.ApplicationDetailFormDTO; import com.epmet.resi.group.dto.group.form.ApplicationHistoryFormDTO; import com.epmet.resi.group.dto.group.form.ApplicationListFormDTO; @@ -130,9 +131,9 @@ public class IssueApplicationController { * @Date 2020/11/18 16:26 **/ @PostMapping("listissueapp") - public Result> listIssueApp(@RequestBody IssueAppQueryFormDTO formDTO){ - ValidatorUtils.validateEntity(formDTO); - List list=issueApplicationService.listIssueApp(formDTO); - return new Result>().ok(list); + public Result> listIssueApp(@RequestBody IssueAppQueryFormDTO formDTO){ + ValidatorUtils.validateEntity(formDTO,IssueAppQueryFormDTO.Required.class); + List list=issueApplicationService.listIssueApp(formDTO); + return new Result>().ok(list); } } \ No newline at end of file diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/controller/IssueApplicationHistoryController.java b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/controller/IssueApplicationHistoryController.java index 96a1500bab..1783042c9c 100644 --- a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/controller/IssueApplicationHistoryController.java +++ b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/controller/IssueApplicationHistoryController.java @@ -26,6 +26,7 @@ import com.epmet.commons.tools.validator.group.DefaultGroup; import com.epmet.commons.tools.validator.group.UpdateGroup; import com.epmet.dto.IssueApplicationHistoryDTO; import com.epmet.dto.form.IssueApplicationIdFormDTO; +import com.epmet.dto.result.ApplicationHistoryResDTO; import com.epmet.service.IssueApplicationHistoryService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; @@ -90,8 +91,8 @@ public class IssueApplicationHistoryController { * @Date 2020/11/18 16:57 **/ @PostMapping("querybyissueapplicationid") - public Result> queryByIssueApplicationId(@RequestBody IssueApplicationIdFormDTO formDTO){ + public Result> queryByIssueApplicationId(@RequestBody IssueApplicationIdFormDTO formDTO){ ValidatorUtils.validateEntity(formDTO); - return new Result>().ok(issueApplicationHistoryService.queryByIssueApplicationId(formDTO.getIssueApplicationId())); + return new Result>().ok(issueApplicationHistoryService.queryByIssueApplicationId(formDTO.getIssueApplicationId())); } } \ No newline at end of file diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/controller/IssueAuditController.java b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/controller/IssueAuditController.java new file mode 100644 index 0000000000..af99ad3e74 --- /dev/null +++ b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/controller/IssueAuditController.java @@ -0,0 +1,57 @@ +package com.epmet.controller; + +import com.epmet.commons.tools.utils.Result; +import com.epmet.commons.tools.validator.ValidatorUtils; +import com.epmet.dto.form.IssueAppQueryFormDTO; +import com.epmet.dto.form.IssueApplicationIdFormDTO; +import com.epmet.dto.result.ApplicationHistoryResDTO; +import com.epmet.dto.result.IssueApplicationResDTO; +import com.epmet.service.IssueApplicationHistoryService; +import com.epmet.service.IssueApplicationService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import java.util.List; + +/** + * 基层治理-议题管理 议题审核相关API + * + * @author yinzuomei@elink-cn.com + * @date 2020/11/18 17:13 + */ +@RestController +@RequestMapping("issueaudit") +public class IssueAuditController { + @Autowired + private IssueApplicationService issueApplicationService; + @Autowired + private IssueApplicationHistoryService issueApplicationHistoryService; + + /** + * @param formDTO + * @author yinzuomei + * @description 待审核|| 已驳回 列表 + * @Date 2020/11/18 17:28 + **/ + @PostMapping("applicationlist") + public Result> queryIssueAppliationList(@RequestBody IssueAppQueryFormDTO formDTO) { + ValidatorUtils.validateEntity(formDTO,IssueAppQueryFormDTO.Required.class,IssueAppQueryFormDTO.GovFormDTO.class); + return new Result>().ok(issueApplicationService.listIssueApp(formDTO)); + } + + + /** + * @param formDTO + * @author yinzuomei + * @description 话题转议题申请详情- 审核历史查询 + * @Date 2020/11/18 17:40 + **/ + @PostMapping("applicationhistory") + public Result> queryApplicationHistory(@RequestBody IssueApplicationIdFormDTO formDTO){ + ValidatorUtils.validateEntity(formDTO); + return new Result>().ok(issueApplicationHistoryService.queryByIssueApplicationId(formDTO.getIssueApplicationId())); + } +} diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/dao/IssueApplicationDao.java b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/dao/IssueApplicationDao.java index 3dfa42b4b2..efe02e3c0b 100644 --- a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/dao/IssueApplicationDao.java +++ b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/dao/IssueApplicationDao.java @@ -18,8 +18,8 @@ package com.epmet.dao; import com.epmet.commons.mybatis.dao.BaseDao; -import com.epmet.dto.IssueApplicationDTO; import com.epmet.dto.form.IssueAppQueryFormDTO; +import com.epmet.dto.result.IssueApplicationResDTO; import com.epmet.entity.IssueApplicationEntity; import com.epmet.resi.group.dto.group.form.ApplicationDetailFormDTO; import com.epmet.resi.group.dto.group.result.ApplicationDetailResultDTO; @@ -51,5 +51,5 @@ public interface IssueApplicationDao extends BaseDao { * @description 分页按条件查询issue_application * @Date 2020/11/18 16:28 **/ - List selectList(IssueAppQueryFormDTO formDTO); + List selectList(IssueAppQueryFormDTO formDTO); } \ No newline at end of file diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/dao/IssueApplicationHistoryDao.java b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/dao/IssueApplicationHistoryDao.java index b494114539..e2639185b3 100644 --- a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/dao/IssueApplicationHistoryDao.java +++ b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/dao/IssueApplicationHistoryDao.java @@ -18,7 +18,7 @@ package com.epmet.dao; import com.epmet.commons.mybatis.dao.BaseDao; -import com.epmet.dto.IssueApplicationHistoryDTO; +import com.epmet.dto.result.ApplicationHistoryResDTO; import com.epmet.entity.IssueApplicationHistoryEntity; import org.apache.ibatis.annotations.Mapper; @@ -39,5 +39,5 @@ public interface IssueApplicationHistoryDao extends BaseDao selectListByIssueApplicationId(String issueApplicationId); + List selectListByIssueApplicationId(String issueApplicationId); } \ No newline at end of file diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/IssueApplicationHistoryService.java b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/IssueApplicationHistoryService.java index e8c354b793..b0d7aed3eb 100644 --- a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/IssueApplicationHistoryService.java +++ b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/IssueApplicationHistoryService.java @@ -20,6 +20,7 @@ package com.epmet.service; import com.epmet.commons.mybatis.service.BaseService; import com.epmet.commons.tools.page.PageData; import com.epmet.dto.IssueApplicationHistoryDTO; +import com.epmet.dto.result.ApplicationHistoryResDTO; import com.epmet.entity.IssueApplicationHistoryEntity; import java.util.List; @@ -99,5 +100,5 @@ public interface IssueApplicationHistoryService extends BaseService queryByIssueApplicationId(String issueApplicationId); + List queryByIssueApplicationId(String issueApplicationId); } \ No newline at end of file diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/IssueApplicationService.java b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/IssueApplicationService.java index de018bdf59..14bee01aa4 100644 --- a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/IssueApplicationService.java +++ b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/IssueApplicationService.java @@ -21,6 +21,7 @@ import com.epmet.commons.mybatis.service.BaseService; import com.epmet.commons.tools.page.PageData; import com.epmet.dto.IssueApplicationDTO; import com.epmet.dto.form.IssueAppQueryFormDTO; +import com.epmet.dto.result.IssueApplicationResDTO; import com.epmet.entity.IssueApplicationEntity; import com.epmet.resi.group.dto.group.form.ApplicationDetailFormDTO; import com.epmet.resi.group.dto.group.form.ApplicationHistoryFormDTO; @@ -131,5 +132,5 @@ public interface IssueApplicationService extends BaseService listIssueApp(IssueAppQueryFormDTO formDTO); + List listIssueApp(IssueAppQueryFormDTO formDTO); } \ No newline at end of file diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueApplicationHistoryServiceImpl.java b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueApplicationHistoryServiceImpl.java index aeac536340..1772e9a2e5 100644 --- a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueApplicationHistoryServiceImpl.java +++ b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueApplicationHistoryServiceImpl.java @@ -20,11 +20,12 @@ package com.epmet.service.impl; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.epmet.commons.mybatis.service.impl.BaseServiceImpl; +import com.epmet.commons.tools.constant.FieldConstant; import com.epmet.commons.tools.page.PageData; import com.epmet.commons.tools.utils.ConvertUtils; -import com.epmet.commons.tools.constant.FieldConstant; import com.epmet.dao.IssueApplicationHistoryDao; import com.epmet.dto.IssueApplicationHistoryDTO; +import com.epmet.dto.result.ApplicationHistoryResDTO; import com.epmet.entity.IssueApplicationHistoryEntity; import com.epmet.service.IssueApplicationHistoryService; import org.apache.commons.lang3.StringUtils; @@ -103,7 +104,7 @@ public class IssueApplicationHistoryServiceImpl extends BaseServiceImpl queryByIssueApplicationId(String issueApplicationId) { + public List queryByIssueApplicationId(String issueApplicationId) { return baseDao.selectListByIssueApplicationId(issueApplicationId); } diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueApplicationServiceImpl.java b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueApplicationServiceImpl.java index 4f66688834..429bfad66e 100644 --- a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueApplicationServiceImpl.java +++ b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueApplicationServiceImpl.java @@ -26,6 +26,7 @@ import com.epmet.commons.tools.utils.ConvertUtils; import com.epmet.dao.IssueApplicationDao; import com.epmet.dto.IssueApplicationDTO; import com.epmet.dto.form.IssueAppQueryFormDTO; +import com.epmet.dto.result.IssueApplicationResDTO; import com.epmet.entity.IssueApplicationEntity; import com.epmet.resi.group.dto.group.form.ApplicationDetailFormDTO; import com.epmet.resi.group.dto.group.form.ApplicationHistoryFormDTO; @@ -112,7 +113,7 @@ public class IssueApplicationServiceImpl extends BaseServiceImpl listIssueApp(IssueAppQueryFormDTO formDTO) { + public List listIssueApp(IssueAppQueryFormDTO formDTO) { PageHelper.startPage(formDTO.getPageNo(),formDTO.getPageSize()); return baseDao.selectList(formDTO); } diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/resources/mapper/IssueApplicationDao.xml b/epmet-module/gov-issue/gov-issue-server/src/main/resources/mapper/IssueApplicationDao.xml index 35123773a5..1920385ebc 100644 --- a/epmet-module/gov-issue/gov-issue-server/src/main/resources/mapper/IssueApplicationDao.xml +++ b/epmet-module/gov-issue/gov-issue-server/src/main/resources/mapper/IssueApplicationDao.xml @@ -15,24 +15,13 @@ AND ID = #{issueApplicationId} - SELECT - ia.ID, - ia.CUSTOMER_ID, + ia.id AS issueApplicationId, ia.ISSUE_TITLE, + unix_timestamp( ia.UPDATED_TIME ) AS latestTime ia.SUGGESTION, - ia.APPLY_STATUS, - ia.TOPIC_ID, - ia.GROUP_ID, - ia.GRID_ID, - ia.ISSUE_ID, - ia.PASSED_REASON, - ia.CREATED_BY, - ia.CREATED_TIME, - ia.UPDATED_BY, - ia.UPDATED_TIME, - ia.id AS issueApplicationId, - unix_timestamp( ia.UPDATED_TIME ) AS time + ia.APPLY_STATUS FROM issue_application ia WHERE diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/resources/mapper/IssueApplicationHistoryDao.xml b/epmet-module/gov-issue/gov-issue-server/src/main/resources/mapper/IssueApplicationHistoryDao.xml index 7f362d2d6a..e3bc84fc2a 100644 --- a/epmet-module/gov-issue/gov-issue-server/src/main/resources/mapper/IssueApplicationHistoryDao.xml +++ b/epmet-module/gov-issue/gov-issue-server/src/main/resources/mapper/IssueApplicationHistoryDao.xml @@ -3,9 +3,9 @@ - SELECT - iah.ID, + iah.ID as historyId, iah.ACTION_TYPE, unix_timestamp( iah.CREATED_TIME ) AS operateTime, iah.REASON, diff --git a/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/group/result/ApplicationHistoryResultDTO.java b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/group/result/ApplicationHistoryResultDTO.java index ce17c8cd5e..d2ebeb7986 100644 --- a/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/group/result/ApplicationHistoryResultDTO.java +++ b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/group/result/ApplicationHistoryResultDTO.java @@ -1,5 +1,6 @@ package com.epmet.resi.group.dto.group.result; +import com.fasterxml.jackson.annotation.JsonIgnore; import lombok.Data; import java.io.Serializable; @@ -36,6 +37,7 @@ public class ApplicationHistoryResultDTO implements Serializable { /** * 工作人员姓名；居民端不展示此列 */ + @JsonIgnore private String staffName; } diff --git a/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/group/result/ApplicationListResultDTO.java b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/group/result/ApplicationListResultDTO.java index c570e83d23..abc332d84c 100644 --- a/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/group/result/ApplicationListResultDTO.java +++ b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/group/result/ApplicationListResultDTO.java @@ -32,7 +32,7 @@ public class ApplicationListResultDTO implements Serializable { /** * 对应issue_application.UPDATED_TIME 对应的秒级时间戳 */ - private Long time; + private Long latestTime; /** * 审核状态。under_auditing:审核中,approved:通过，rejected:驳回 @@ -42,7 +42,7 @@ public class ApplicationListResultDTO implements Serializable { public ApplicationListResultDTO() { this.issueTitle = ""; this.suggestion = ""; - this.time = NumConstant.ZERO_L; + this.latestTime = NumConstant.ZERO_L; this.applyStatus = ""; } } diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/service/impl/GroupIssueServiceImpl.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/service/impl/GroupIssueServiceImpl.java index a72c40cb4b..283de3e222 100644 --- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/service/impl/GroupIssueServiceImpl.java +++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/service/impl/GroupIssueServiceImpl.java @@ -3,20 +3,16 @@ package com.epmet.modules.group.service.impl; import com.epmet.commons.tools.exception.RenException; import com.epmet.commons.tools.utils.ConvertUtils; import com.epmet.commons.tools.utils.Result; +import com.epmet.dto.form.IssueAppQueryFormDTO; +import com.epmet.dto.form.IssueApplicationIdFormDTO; import com.epmet.dto.result.AllGridsByUserIdResultDTO; +import com.epmet.dto.result.ApplicationHistoryResDTO; +import com.epmet.dto.result.IssueApplicationResDTO; import com.epmet.dto.result.UserBaseInfoResultDTO; import com.epmet.feign.EpmetUserOpenFeignClient; import com.epmet.feign.GovIssueOpenFeignClient; import com.epmet.feign.GovOrgOpenFeignClient; import com.epmet.modules.group.dao.ResiGroupDao; -import com.epmet.commons.tools.exception.RenException; -import com.epmet.commons.tools.utils.ConvertUtils; -import com.epmet.commons.tools.utils.Result; -import com.epmet.dto.IssueApplicationDTO; -import com.epmet.dto.IssueApplicationHistoryDTO; -import com.epmet.dto.form.IssueAppQueryFormDTO; -import com.epmet.dto.form.IssueApplicationIdFormDTO; -import com.epmet.feign.GovIssueOpenFeignClient; import com.epmet.modules.group.service.GroupIssueService; import com.epmet.modules.topic.service.ResiTopicService; import com.epmet.resi.group.dto.group.form.AllIssueFormDTO; @@ -28,7 +24,6 @@ import lombok.extern.slf4j.Slf4j; import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import java.util.ArrayList; @@ -137,7 +132,7 @@ public class GroupIssueServiceImpl implements GroupIssueService { */ @Override public List applicationHistory(ApplicationHistoryFormDTO applicationHistoryFormDTO) { - Result> result = govIssueOpenFeignClient.queryByIssueApplicationId(new IssueApplicationIdFormDTO(applicationHistoryFormDTO.getIssueApplicationId())); + Result> result = govIssueOpenFeignClient.queryByIssueApplicationId(new IssueApplicationIdFormDTO(applicationHistoryFormDTO.getIssueApplicationId())); if (result.success() && CollectionUtils.isNotEmpty(result.getData())) { List list=ConvertUtils.sourceToTarget(result.getData(),ApplicationHistoryResultDTO.class); return list; @@ -154,7 +149,7 @@ public class GroupIssueServiceImpl implements GroupIssueService { @Override public List applicationList(ApplicationListFormDTO applicationListFormDTO) { IssueAppQueryFormDTO issueAppQueryFormDTO = ConvertUtils.sourceToTarget(applicationListFormDTO, IssueAppQueryFormDTO.class); - Result> result = govIssueOpenFeignClient.listIssueApp(issueAppQueryFormDTO); + Result> result = govIssueOpenFeignClient.listIssueApp(issueAppQueryFormDTO); if (result.success() && CollectionUtils.isNotEmpty(result.getData())) { List list = ConvertUtils.sourceToTarget(result.getData(), ApplicationListResultDTO.class); return list;