议题处理进度

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.*;
-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.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<List<WorkEventCommentResultDTO>> commentList(@RequestBody WorkEventCommentListFormDTO formDTO){
         return workIssueService.selectWorkHotOrNewEventComment(formDTO);
     }
+
+    /**
+     *
+     * 议题处理进度(后台/工作端用)
+     *
+     * @params [issueId]
+     * @return java.util.List<com.elink.esua.epdc.dto.issue.result.IssueProgressResultDTO>
+     * @author liuchuang
+     * @since 2019/11/21 15:16
+     */
+    @GetMapping("issue/processList")
+    public Result<List<IssueProgressResultDTO>> processList(@RequestBody WorkProcessListFormDTO workProcessListFormDTO){
+        return workIssueService.processList(workProcessListFormDTO);
+    }
 }

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<List<WorkEventCommentResultDTO>> commentList(@RequestBody WorkEventCommentListFormDTO formDTO);
 
+    /**
+     *
+     * 议题处理进度(后台/工作端用)
+     *
+     * @params [issueId]
+     * @return java.util.List<com.elink.esua.epdc.dto.issue.result.IssueProgressResultDTO>
+     * @author liuchuang
+     * @since 2019/11/21 15:16
+     */
+    @GetMapping(value = "events/epdc-app/work/issue/processList", consumes = MediaType.APPLICATION_JSON_VALUE)
+    Result<List<IssueProgressResultDTO>> processList(@RequestBody WorkProcessListFormDTO workProcessListFormDTO);
+
 }

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<List<WorkEventCommentResultDTO>> commentList(WorkEventCommentListFormDTO formDTO) {
         return ModuleUtils.feignConError(ServiceConstant.EPDC_EVENTS_SERVER, "commentList", formDTO);
     }
+
+    @Override
+    public Result<List<IssueProgressResultDTO>> processList(WorkProcessListFormDTO workProcessListFormDTO) {
+        return ModuleUtils.feignConError(ServiceConstant.EPDC_EVENTS_SERVER, "processList", workProcessListFormDTO);
+    }
 }

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.*;
-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.result.*;
+import org.springframework.web.bind.annotation.RequestBody;
 
 import java.util.List;
 
@@ -84,4 +82,15 @@ public interface WorkIssueService {
      * @return
      */
     Result<List<WorkEventCommentResultDTO>> selectWorkHotOrNewEventComment(WorkEventCommentListFormDTO formDTO);
+
+    /**
+     *
+     * 议题处理进度(后台/工作端用)
+     *
+     * @params [issueId]
+     * @return java.util.List<com.elink.esua.epdc.dto.issue.result.IssueProgressResultDTO>
+     * @author liuchuang
+     * @since 2019/11/21 15:16
+     */
+    Result<List<IssueProgressResultDTO>> processList(@RequestBody WorkProcessListFormDTO workProcessListFormDTO);
 }

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.*;
-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.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<List<WorkEventCommentResultDTO>> selectWorkHotOrNewEventComment(WorkEventCommentListFormDTO formDTO) {
         return workIssueFeignClient.commentList(formDTO);
     }
+
+    /**
+     *
+     * 议题处理进度(后台/工作端用)
+     *
+     * @params [issueId]
+     * @return java.util.List<com.elink.esua.epdc.dto.issue.result.IssueProgressResultDTO>
+     * @author liuchuang
+     * @since 2019/11/21 15:16
+     */
+    @Override
+    public Result<List<IssueProgressResultDTO>> processList(WorkProcessListFormDTO workProcessListFormDTO) {
+        return workIssueFeignClient.processList(workProcessListFormDTO);
+    }
 }

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;
+
+}

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.form.WorkProcessListFormDTO;
-import com.elink.esua.epdc.dto.issue.result.IssueStateStatisticsResultDTO;
+import com.elink.esua.epdc.dto.issue.result.*;
-import com.elink.esua.epdc.dto.issue.result.WorkIssueDetailResultDTO;
-import com.elink.esua.epdc.dto.issue.result.WorkIssueListResultDTO;
 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<WorkIssueDetailResultDTO>().ok(workIssueDetailResultDTO);
     }
 
+    /**
+     *
+     * 议题处理进度(后台/工作端用)
+     *
+     * @params [issueId]
+     * @return java.util.List<com.elink.esua.epdc.dto.issue.result.IssueProgressResultDTO>
+     * @author liuchuang
+     * @since 2019/11/21 15:16
+     */
+    @GetMapping("processList")
+    public Result<List<IssueProgressResultDTO>> processList(@RequestBody WorkProcessListFormDTO workProcessListFormDTO){
+        List<IssueProgressResultDTO> list = issueService.listIssueProgress(workProcessListFormDTO.getIssueId());
+        return new Result<List<IssueProgressResultDTO>>().ok(list);
+    }
+
+
 }