From 776682b699899adf17f96b2e2142ba4bc1ae9ad1 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Wed, 18 Nov 2020 17:09:04 +0800 Subject: [PATCH] =?UTF-8?q?=E5=B1=85=E6=B0=91=E7=AB=AF=EF=BC=9A=E8=AF=9D?= =?UTF-8?q?=E9=A2=98=E8=BD=AC=E8=AE=AE=E9=A2=98=E7=94=B3=E8=AF=B7=E8=AF=A6?= =?UTF-8?q?=E6=83=85-=C2=A0=E5=AE=A1=E6=A0=B8=E5=8E=86=E5=8F=B2=E6=9F=A5?= =?UTF-8?q?=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../epmet/dto/IssueApplicationHistoryDTO.java | 10 ++++++++ .../dto/form/IssueApplicationIdFormDTO.java | 23 +++++++++++++++++++ .../epmet/feign/GovIssueOpenFeignClient.java | 13 ++++++++++- .../GovIssueOpenFeignClientFallBack.java | 13 +++++++++++ .../IssueApplicationController.java | 2 +- .../IssueApplicationHistoryController.java | 16 ++++++++++--- .../epmet/dao/IssueApplicationHistoryDao.java | 12 +++++++++- .../IssueApplicationHistoryService.java | 8 +++++++ .../IssueApplicationHistoryServiceImpl.java | 11 +++++++++ .../mapper/IssueApplicationHistoryDao.xml | 17 +++++++++++++- .../controller/GroupIssueController.java | 4 ++-- .../group/service/GroupIssueService.java | 2 +- .../service/impl/GroupIssueServiceImpl.java | 13 ++++++++--- 13 files changed, 131 insertions(+), 13 deletions(-) create mode 100644 epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/form/IssueApplicationIdFormDTO.java diff --git a/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/IssueApplicationHistoryDTO.java b/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/IssueApplicationHistoryDTO.java index 09126d923a..fdde89c383 100644 --- a/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/IssueApplicationHistoryDTO.java +++ b/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/IssueApplicationHistoryDTO.java @@ -96,4 +96,14 @@ public class IssueApplicationHistoryDTO implements Serializable { */ private Date updatedTime; + //扩展属性 + /** + * =id + */ + private String historyId; + + /** + * createdTime 对应时间戳 + */ + private Long operateTime; } \ No newline at end of file diff --git a/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/form/IssueApplicationIdFormDTO.java b/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/form/IssueApplicationIdFormDTO.java new file mode 100644 index 0000000000..f1d5bd99a5 --- /dev/null +++ b/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/form/IssueApplicationIdFormDTO.java @@ -0,0 +1,23 @@ +package com.epmet.dto.form; + +import lombok.Data; + +import javax.validation.constraints.NotBlank; +import java.io.Serializable; + +/** + * 根据issue_application.id查询审核历史 + * + * @author yinzuomei@elink-cn.com + * @date 2020/11/18 16:55 + */ +@Data +public class IssueApplicationIdFormDTO implements Serializable { + private static final long serialVersionUID = 3222664262617695211L; + @NotBlank(message = "issueApplicationId不能为空") + private String issueApplicationId; + + public IssueApplicationIdFormDTO(String issueApplicationId) { + this.issueApplicationId = issueApplicationId; + } +} 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 31cee70d03..00b4b64796 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 @@ -3,8 +3,10 @@ package com.epmet.feign; import com.epmet.commons.tools.constant.ServiceConstant; 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; @@ -81,6 +83,15 @@ public interface GovIssueOpenFeignClient { * @description 分页按条件查询issue_application * @Date 2020/11/18 16:40 **/ - @PostMapping(value = "/gov/issue/issueapplication/listIssueApp",consumes = MediaType.APPLICATION_JSON_VALUE) + @PostMapping(value = "/gov/issue/issueapplication/listissueapp",consumes = MediaType.APPLICATION_JSON_VALUE) Result> listIssueApp(@RequestBody IssueAppQueryFormDTO formDTO); + + /** + * @param formDTO + * @author yinzuomei + * @description 根据issue_application.id查询审核历史 + * @Date 2020/11/18 17:03 + **/ + @PostMapping(value = "/gov/issue/issueapplicationhistory/querybyissueapplicationid",consumes = MediaType.APPLICATION_JSON_VALUE) + 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 16c5bbd548..499d8cb1bf 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 @@ -4,8 +4,10 @@ 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.feign.GovIssueOpenFeignClient; @@ -96,4 +98,15 @@ public class GovIssueOpenFeignClientFallBack implements GovIssueOpenFeignClient public Result> listIssueApp(IssueAppQueryFormDTO formDTO) { return ModuleUtils.feignConError(ServiceConstant.GOV_ISSUE_SERVER, "listIssueApp", formDTO); } + + /** + * @param formDTO + * @author yinzuomei + * @description 根据issue_application.id查询审核历史 + * @Date 2020/11/18 17:03 + **/ + @Override + 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 83e494111d..25bca35f9a 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 @@ -90,7 +90,7 @@ public class IssueApplicationController { * @description 分页按条件查询issue_application * @Date 2020/11/18 16:26 **/ - @PostMapping("listIssueApp") + @PostMapping("listissueapp") public Result> listIssueApp(@RequestBody IssueAppQueryFormDTO formDTO){ ValidatorUtils.validateEntity(formDTO); List list=issueApplicationService.listIssueApp(formDTO); 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 4d050aa2a4..96a1500bab 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 @@ -18,19 +18,18 @@ package com.epmet.controller; import com.epmet.commons.tools.page.PageData; -import com.epmet.commons.tools.utils.ExcelUtils; import com.epmet.commons.tools.utils.Result; import com.epmet.commons.tools.validator.AssertUtils; import com.epmet.commons.tools.validator.ValidatorUtils; import com.epmet.commons.tools.validator.group.AddGroup; -import com.epmet.commons.tools.validator.group.UpdateGroup; 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.service.IssueApplicationHistoryService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; -import javax.servlet.http.HttpServletResponse; import java.util.List; import java.util.Map; @@ -84,4 +83,15 @@ public class IssueApplicationHistoryController { return new Result(); } + /** + * @param formDTO + * @author yinzuomei + * @description 根据issue_application.id查询审核历史 + * @Date 2020/11/18 16:57 + **/ + @PostMapping("querybyissueapplicationid") + public Result> queryByIssueApplicationId(@RequestBody IssueApplicationIdFormDTO formDTO){ + ValidatorUtils.validateEntity(formDTO); + 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/dao/IssueApplicationHistoryDao.java b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/dao/IssueApplicationHistoryDao.java index 3e48aea119..b494114539 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,9 +18,12 @@ package com.epmet.dao; import com.epmet.commons.mybatis.dao.BaseDao; +import com.epmet.dto.IssueApplicationHistoryDTO; import com.epmet.entity.IssueApplicationHistoryEntity; import org.apache.ibatis.annotations.Mapper; +import java.util.List; + /** * 话题转议题审核历史表 * @@ -29,5 +32,12 @@ import org.apache.ibatis.annotations.Mapper; */ @Mapper public interface IssueApplicationHistoryDao extends BaseDao { - + + /** + * @param issueApplicationId + * @author yinzuomei + * @description 根据issue_application.id查询审核历史 + * @Date 2020/11/18 16:59 + **/ + 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 425e0b3ba9..e8c354b793 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 @@ -92,4 +92,12 @@ public interface IssueApplicationHistoryService extends BaseService 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/impl/IssueApplicationHistoryServiceImpl.java b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueApplicationHistoryServiceImpl.java index 3f81d8adc3..aeac536340 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 @@ -96,4 +96,15 @@ public class IssueApplicationHistoryServiceImpl extends BaseServiceImpl queryByIssueApplicationId(String issueApplicationId) { + return baseDao.selectListByIssueApplicationId(issueApplicationId); + } + } \ No newline at end of file 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 85dff9def7..7f362d2d6a 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 @@ -2,6 +2,21 @@ - + + \ No newline at end of file diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/controller/GroupIssueController.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/controller/GroupIssueController.java index ff01971f70..86da4ae08d 100644 --- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/controller/GroupIssueController.java +++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/controller/GroupIssueController.java @@ -48,9 +48,9 @@ public class GroupIssueController { * @date 2020/11/17 10:45 上午 */ @PostMapping("applicationhistory") - public Result applicationHistory(@RequestBody ApplicationHistoryFormDTO applicationHistoryFormDTO){ + public Result> applicationHistory(@RequestBody ApplicationHistoryFormDTO applicationHistoryFormDTO){ ValidatorUtils.validateEntity(applicationHistoryFormDTO, ApplicationHistoryFormDTO.ApplicationHistory.class); - return new Result().ok(groupIssueService.applicationHistory(applicationHistoryFormDTO)); + return new Result>().ok(groupIssueService.applicationHistory(applicationHistoryFormDTO)); } /** diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/service/GroupIssueService.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/service/GroupIssueService.java index 4cd99360fa..aa86a03a27 100644 --- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/service/GroupIssueService.java +++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/service/GroupIssueService.java @@ -29,7 +29,7 @@ public interface GroupIssueService { * @author zxc * @date 2020/11/17 10:45 上午 */ - ApplicationHistoryResultDTO applicationHistory(ApplicationHistoryFormDTO applicationHistoryFormDTO); + List applicationHistory(ApplicationHistoryFormDTO applicationHistoryFormDTO); /** * @Description 待审核||已驳回 申请列表 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 1bb03c5e6b..27e84d72db 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 @@ -4,7 +4,9 @@ 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; @@ -47,14 +49,19 @@ public class GroupIssueServiceImpl implements GroupIssueService { } /** - * @Description 话题转议题申请详情- 审核历史查询 + * @Description 话题转议题申请详情- 审核历史查询 * @Param applicationHistoryFormDTO * @author zxc * @date 2020/11/17 10:45 上午 */ @Override - public ApplicationHistoryResultDTO applicationHistory(ApplicationHistoryFormDTO applicationHistoryFormDTO) { - return null; + public List applicationHistory(ApplicationHistoryFormDTO applicationHistoryFormDTO) { + 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; + } + return new ArrayList<>(); } /**