diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiWorkIssueController.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiWorkIssueController.java index 5ba71cb85..e35c4806d 100644 --- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiWorkIssueController.java +++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiWorkIssueController.java @@ -5,10 +5,7 @@ import com.elink.esua.epdc.commons.tools.utils.Result; import com.elink.esua.epdc.dto.category.EventCategoryDTO; import com.elink.esua.epdc.dto.events.form.EpdcEventsReviewFormDTO; import com.elink.esua.epdc.dto.events.result.EventAppDetailResultDTO; -import com.elink.esua.epdc.dto.issue.form.IssuePendingResponseFormDTO; -import com.elink.esua.epdc.dto.issue.form.IssueStateStatisticsFormDTO; -import com.elink.esua.epdc.dto.issue.form.WorkEventCommentListFormDTO; -import com.elink.esua.epdc.dto.issue.form.WorkIssueListFormDTO; +import com.elink.esua.epdc.dto.issue.form.*; import com.elink.esua.epdc.dto.issue.result.*; import com.elink.esua.epdc.service.WorkIssueService; import org.springframework.beans.factory.annotation.Autowired; @@ -94,7 +91,6 @@ public class ApiWorkIssueController { return workIssueService.selectOneWorkIssueDetail(issueId); } - /** * 工作端-事件评论列表 * @param formDTO @@ -104,4 +100,18 @@ public class ApiWorkIssueController { public Result> commentList(@RequestBody WorkEventCommentListFormDTO formDTO){ return workIssueService.selectWorkHotOrNewEventComment(formDTO); } + + /** + * + * 议题处理进度(后台/工作端用) + * + * @params [issueId] + * @return java.util.List + * @author liuchuang + * @since 2019/11/21 15:16 + */ + @GetMapping("issue/processList") + public Result> processList(@RequestBody WorkProcessListFormDTO workProcessListFormDTO){ + return workIssueService.processList(workProcessListFormDTO); + } } diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/WorkIssueFeignClient.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/WorkIssueFeignClient.java index 4b8eda136..e4de55cab 100644 --- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/WorkIssueFeignClient.java +++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/WorkIssueFeignClient.java @@ -85,4 +85,16 @@ public interface WorkIssueFeignClient { @GetMapping(value = "events/epdc-app/comment/commentList", consumes = MediaType.APPLICATION_JSON_VALUE) Result> commentList(@RequestBody WorkEventCommentListFormDTO formDTO); + /** + * + * 议题处理进度(后台/工作端用) + * + * @params [issueId] + * @return java.util.List + * @author liuchuang + * @since 2019/11/21 15:16 + */ + @GetMapping(value = "events/epdc-app/work/issue/processList", consumes = MediaType.APPLICATION_JSON_VALUE) + Result> processList(@RequestBody WorkProcessListFormDTO workProcessListFormDTO); + } diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/fallback/WorkIssueFeignClientFallback.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/fallback/WorkIssueFeignClientFallback.java index 96699877e..369c7acea 100644 --- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/fallback/WorkIssueFeignClientFallback.java +++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/fallback/WorkIssueFeignClientFallback.java @@ -61,4 +61,9 @@ public class WorkIssueFeignClientFallback implements WorkIssueFeignClient { public Result> commentList(WorkEventCommentListFormDTO formDTO) { return ModuleUtils.feignConError(ServiceConstant.EPDC_EVENTS_SERVER, "commentList", formDTO); } + + @Override + public Result> processList(WorkProcessListFormDTO workProcessListFormDTO) { + return ModuleUtils.feignConError(ServiceConstant.EPDC_EVENTS_SERVER, "processList", workProcessListFormDTO); + } } diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/WorkIssueService.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/WorkIssueService.java index 5c481cf53..1e2eba924 100644 --- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/WorkIssueService.java +++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/WorkIssueService.java @@ -22,11 +22,9 @@ import com.elink.esua.epdc.commons.tools.utils.Result; import com.elink.esua.epdc.dto.category.EventCategoryDTO; import com.elink.esua.epdc.dto.events.form.EpdcEventsReviewFormDTO; import com.elink.esua.epdc.dto.events.result.EventAppDetailResultDTO; -import com.elink.esua.epdc.dto.issue.form.IssuePendingResponseFormDTO; -import com.elink.esua.epdc.dto.issue.form.IssueStateStatisticsFormDTO; -import com.elink.esua.epdc.dto.issue.form.WorkEventCommentListFormDTO; -import com.elink.esua.epdc.dto.issue.form.WorkIssueListFormDTO; +import com.elink.esua.epdc.dto.issue.form.*; import com.elink.esua.epdc.dto.issue.result.*; +import org.springframework.web.bind.annotation.RequestBody; import java.util.List; @@ -84,4 +82,15 @@ public interface WorkIssueService { * @return */ Result> selectWorkHotOrNewEventComment(WorkEventCommentListFormDTO formDTO); + + /** + * + * 议题处理进度(后台/工作端用) + * + * @params [issueId] + * @return java.util.List + * @author liuchuang + * @since 2019/11/21 15:16 + */ + Result> processList(@RequestBody WorkProcessListFormDTO workProcessListFormDTO); } diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/WorkIssueServiceImpl.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/WorkIssueServiceImpl.java index a0d0f8b38..a82c68e79 100644 --- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/WorkIssueServiceImpl.java +++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/WorkIssueServiceImpl.java @@ -21,10 +21,7 @@ import com.elink.esua.epdc.commons.tools.utils.Result; import com.elink.esua.epdc.dto.category.EventCategoryDTO; import com.elink.esua.epdc.dto.events.form.EpdcEventsReviewFormDTO; import com.elink.esua.epdc.dto.events.result.EventAppDetailResultDTO; -import com.elink.esua.epdc.dto.issue.form.IssuePendingResponseFormDTO; -import com.elink.esua.epdc.dto.issue.form.IssueStateStatisticsFormDTO; -import com.elink.esua.epdc.dto.issue.form.WorkEventCommentListFormDTO; -import com.elink.esua.epdc.dto.issue.form.WorkIssueListFormDTO; +import com.elink.esua.epdc.dto.issue.form.*; import com.elink.esua.epdc.dto.issue.result.*; import com.elink.esua.epdc.feign.WorkIssueFeignClient; import com.elink.esua.epdc.service.WorkIssueService; @@ -116,4 +113,18 @@ public class WorkIssueServiceImpl implements WorkIssueService { public Result> selectWorkHotOrNewEventComment(WorkEventCommentListFormDTO formDTO) { return workIssueFeignClient.commentList(formDTO); } + + /** + * + * 议题处理进度(后台/工作端用) + * + * @params [issueId] + * @return java.util.List + * @author liuchuang + * @since 2019/11/21 15:16 + */ + @Override + public Result> processList(WorkProcessListFormDTO workProcessListFormDTO) { + return workIssueFeignClient.processList(workProcessListFormDTO); + } } diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/issue/form/WorkProcessListFormDTO.java b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/issue/form/WorkProcessListFormDTO.java new file mode 100644 index 000000000..323109145 --- /dev/null +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/issue/form/WorkProcessListFormDTO.java @@ -0,0 +1,22 @@ +package com.elink.esua.epdc.dto.issue.form; + +import lombok.Data; + +import javax.validation.constraints.NotBlank; +import java.io.Serializable; + +/** + * 议题详情DTO + * @Author LC + * @Date 2019/9/9 11:11 + */ +@Data +public class WorkProcessListFormDTO implements Serializable { + private static final long serialVersionUID = -3193376894926069344L; + /** + * 议题ID + */ + @NotBlank(message = "议题ID不能为空") + private String issueId; + +} diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/issue/controller/EpdcAppWorkIssueController.java b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/issue/controller/EpdcAppWorkIssueController.java index 027d8f5c0..849fbbc32 100644 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/issue/controller/EpdcAppWorkIssueController.java +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/issue/controller/EpdcAppWorkIssueController.java @@ -6,10 +6,8 @@ import com.elink.esua.epdc.dto.category.EventCategoryDTO; import com.elink.esua.epdc.dto.issue.form.IssuePendingResponseFormDTO; import com.elink.esua.epdc.dto.issue.form.IssueStateStatisticsFormDTO; import com.elink.esua.epdc.dto.issue.form.WorkIssueListFormDTO; -import com.elink.esua.epdc.dto.issue.result.IssuePendingResponseResultDTO; -import com.elink.esua.epdc.dto.issue.result.IssueStateStatisticsResultDTO; -import com.elink.esua.epdc.dto.issue.result.WorkIssueDetailResultDTO; -import com.elink.esua.epdc.dto.issue.result.WorkIssueListResultDTO; +import com.elink.esua.epdc.dto.issue.form.WorkProcessListFormDTO; +import com.elink.esua.epdc.dto.issue.result.*; import com.elink.esua.epdc.modules.category.service.EventCategoryService; import com.elink.esua.epdc.modules.issue.service.IssueService; import org.springframework.beans.factory.annotation.Autowired; @@ -81,4 +79,20 @@ public class EpdcAppWorkIssueController { return new Result().ok(workIssueDetailResultDTO); } + /** + * + * 议题处理进度(后台/工作端用) + * + * @params [issueId] + * @return java.util.List + * @author liuchuang + * @since 2019/11/21 15:16 + */ + @GetMapping("processList") + public Result> processList(@RequestBody WorkProcessListFormDTO workProcessListFormDTO){ + List list = issueService.listIssueProgress(workProcessListFormDTO.getIssueId()); + return new Result>().ok(list); + } + + }