移动端议题处理进度接口 init

esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiIssueController.java

@@ -8,6 +8,7 @@ import com.elink.esua.epdc.dto.events.form.EpdcEventSubmitFormDTO;
 import com.elink.esua.epdc.dto.issue.form.IssueFormDTO;
 import com.elink.esua.epdc.dto.issue.result.IssueCategoryStatisticsResultDTO;
 import com.elink.esua.epdc.dto.issue.result.IssueDetailResultDTO;
+import com.elink.esua.epdc.dto.issue.result.IssueHandleProgressResultDTO;
 import com.elink.esua.epdc.dto.issue.result.IssueResultDTO;
 import com.elink.esua.epdc.service.IssueService;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -88,4 +89,16 @@ public class ApiIssueController {
         return issueService.getIssueCategoryStatistics(userDetail, categoryId);
     }
 
+    /**
+     * 议题处理进度
+     * @Params: [issueId]
+     * @Return: com.elink.esua.epdc.commons.tools.utils.Result<java.util.List<com.elink.esua.epdc.dto.issue.result.IssueHandleProgressResultDTO>>
+     * @Author: liuchuang
+     * @Date: 2019/9/9 13:14
+     */
+    @GetMapping("progress/{issueId}")
+    public Result<List<IssueHandleProgressResultDTO>> issueHandleProgress(@PathVariable String issueId) {
+        return issueService.getIssueHandleProgress(issueId);
+    }
+
 }

esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/IssueFeignClient.java

@@ -8,11 +8,13 @@ import com.elink.esua.epdc.dto.issue.form.IssueDetailFormDTO;
 import com.elink.esua.epdc.dto.issue.form.IssueFormDTO;
 import com.elink.esua.epdc.dto.issue.result.IssueCategoryStatisticsResultDTO;
 import com.elink.esua.epdc.dto.issue.result.IssueDetailResultDTO;
+import com.elink.esua.epdc.dto.issue.result.IssueHandleProgressResultDTO;
 import com.elink.esua.epdc.dto.issue.result.IssueResultDTO;
 import com.elink.esua.epdc.feign.fallback.IssueFeignClientFallback;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.http.MediaType;
 import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.PostMapping;
 
 import java.util.List;
@@ -64,4 +66,14 @@ public interface IssueFeignClient {
      */
     @GetMapping(value = "events/epdc-app/issue/statistics", consumes = MediaType.APPLICATION_JSON_VALUE)
     Result<IssueCategoryStatisticsResultDTO> issueCategoryStatistics(IssueCategoryStatisticsFormDTO formDto);
+
+    /**
+     * 议题处理进度
+     * @Params: [issueId]
+     * @Return: com.elink.esua.epdc.commons.tools.utils.Result<java.util.List<com.elink.esua.epdc.dto.issue.result.IssueHandleProgressResultDTO>>
+     * @Author: liuchuang
+     * @Date: 2019/9/9 13:31
+     */
+    @GetMapping(value = "events/epdc-app/issue/progress/{issueId}", consumes = MediaType.APPLICATION_JSON_VALUE)
+    Result<List<IssueHandleProgressResultDTO>> issueHandleProgress(@PathVariable String issueId);
 }

esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/fallback/IssueFeignClientFallback.java

@@ -9,9 +9,11 @@ import com.elink.esua.epdc.dto.issue.form.IssueDetailFormDTO;
 import com.elink.esua.epdc.dto.issue.form.IssueFormDTO;
 import com.elink.esua.epdc.dto.issue.result.IssueCategoryStatisticsResultDTO;
 import com.elink.esua.epdc.dto.issue.result.IssueDetailResultDTO;
+import com.elink.esua.epdc.dto.issue.result.IssueHandleProgressResultDTO;
 import com.elink.esua.epdc.dto.issue.result.IssueResultDTO;
 import com.elink.esua.epdc.feign.IssueFeignClient;
 import org.springframework.stereotype.Component;
+import org.springframework.web.bind.annotation.PathVariable;
 
 import java.util.List;
 
@@ -41,4 +43,9 @@ public class IssueFeignClientFallback implements IssueFeignClient {
     public Result<IssueCategoryStatisticsResultDTO> issueCategoryStatistics(IssueCategoryStatisticsFormDTO formDto) {
         return ModuleUtils.feignConError(ServiceConstant.EPDC_EVENTS_SERVER, "issueCategoryStatistics", formDto);
     }
+
+    @Override
+    public Result<List<IssueHandleProgressResultDTO>> issueHandleProgress(String issueId) {
+        return ModuleUtils.feignConError(ServiceConstant.EPDC_EVENTS_SERVER, "issueHandleProgress", issueId);
+    }
 }

esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/IssueService.java

@@ -7,6 +7,7 @@ import com.elink.esua.epdc.dto.events.form.EpdcEventSubmitFormDTO;
 import com.elink.esua.epdc.dto.issue.form.IssueFormDTO;
 import com.elink.esua.epdc.dto.issue.result.IssueCategoryStatisticsResultDTO;
 import com.elink.esua.epdc.dto.issue.result.IssueDetailResultDTO;
+import com.elink.esua.epdc.dto.issue.result.IssueHandleProgressResultDTO;
 import com.elink.esua.epdc.dto.issue.result.IssueResultDTO;
 import org.springframework.web.multipart.MultipartFile;
 
@@ -63,4 +64,13 @@ public interface IssueService {
      * @Date: 2019/9/9 12:27
      */
     Result<IssueCategoryStatisticsResultDTO> getIssueCategoryStatistics(TokenDto userDetail, String categoryId);
+
+    /**
+     * 议题处理进度
+     * @Params: [issueId]
+     * @Return: com.elink.esua.epdc.commons.tools.utils.Result<java.util.List<com.elink.esua.epdc.dto.issue.result.IssueHandleProgressResultDTO>>
+     * @Author: liuchuang
+     * @Date: 2019/9/9 13:28
+     */
+    Result<List<IssueHandleProgressResultDTO>> getIssueHandleProgress(String issueId);
 }

esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/IssueServiceImpl.java

@@ -10,6 +10,7 @@ import com.elink.esua.epdc.dto.issue.form.IssueDetailFormDTO;
 import com.elink.esua.epdc.dto.issue.form.IssueFormDTO;
 import com.elink.esua.epdc.dto.issue.result.IssueCategoryStatisticsResultDTO;
 import com.elink.esua.epdc.dto.issue.result.IssueDetailResultDTO;
+import com.elink.esua.epdc.dto.issue.result.IssueHandleProgressResultDTO;
 import com.elink.esua.epdc.dto.issue.result.IssueResultDTO;
 import com.elink.esua.epdc.feign.AdminFeignClient;
 import com.elink.esua.epdc.feign.IssueFeignClient;
@@ -86,4 +87,9 @@ public class IssueServiceImpl implements IssueService {
         formDto.setGridId(userDetail.getGridId());
         return issueFeignClient.issueCategoryStatistics(formDto);
     }
+
+    @Override
+    public Result<List<IssueHandleProgressResultDTO>> getIssueHandleProgress(String issueId) {
+        return issueFeignClient.issueHandleProgress(issueId);
+    }
 }

esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/issue/result/IssueHandleProgressResultDTO.java

@@ -0,0 +1,28 @@
+package com.elink.esua.epdc.dto.issue.result;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * 议题处理进度DTO
+ * @Author LC
+ * @Date 2019/9/9 13:11
+ */
+@Data
+public class IssueHandleProgressResultDTO implements Serializable {
+    private static final long serialVersionUID = 2179111743827985376L;
+
+    /**
+     * 处理状态
+     */
+    private String stateName;
+    /**
+     * 创建时间
+     */
+    private String createdTime;
+    /**
+     * 处理描述
+     */
+    private String advice;
+}

esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/issue/controller/EpdcAppIssueController.java

@@ -8,13 +8,11 @@ import com.elink.esua.epdc.dto.issue.form.IssueDetailFormDTO;
 import com.elink.esua.epdc.dto.issue.form.IssueFormDTO;
 import com.elink.esua.epdc.dto.issue.result.IssueCategoryStatisticsResultDTO;
 import com.elink.esua.epdc.dto.issue.result.IssueDetailResultDTO;
+import com.elink.esua.epdc.dto.issue.result.IssueHandleProgressResultDTO;
 import com.elink.esua.epdc.dto.issue.result.IssueResultDTO;
 import com.elink.esua.epdc.modules.issue.service.IssueService;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 import java.util.List;
 
@@ -68,4 +66,16 @@ public class EpdcAppIssueController {
         ValidatorUtils.validateEntity(formDto);
         return this.issueService.getIssueCategoryStatistics(formDto);
     }
+
+    /**
+     * 议题处理进度
+     * @Params: [issueId]
+     * @Return: com.elink.esua.epdc.commons.tools.utils.Result<java.util.List<com.elink.esua.epdc.dto.issue.result.IssueHandleProgressResultDTO>>
+     * @Author: liuchuang
+     * @Date: 2019/9/9 13:33
+     */
+    @GetMapping("progress/{issueId}")
+    public Result<List<IssueHandleProgressResultDTO>> issueHandleProgress(@PathVariable String issueId) {
+        return issueService.getIssueHandleProgress(issueId);
+    }
 }

esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/issue/dao/IssueDao.java

@@ -28,6 +28,7 @@ import com.elink.esua.epdc.dto.issue.form.IssueDetailFormDTO;
 import com.elink.esua.epdc.dto.issue.form.IssueFormDTO;
 import com.elink.esua.epdc.dto.issue.result.IssueCategoryStatisticsResultDTO;
 import com.elink.esua.epdc.dto.issue.result.IssueDetailResultDTO;
+import com.elink.esua.epdc.dto.issue.result.IssueHandleProgressResultDTO;
 import com.elink.esua.epdc.dto.issue.result.IssueResultDTO;
 import com.elink.esua.epdc.modules.issue.entity.IssueEntity;
 import org.apache.ibatis.annotations.Mapper;
@@ -91,7 +92,7 @@ public interface IssueDao extends BaseDao<IssueEntity> {
     void updateCommentDelFlag(@Param("commentIds") String[] commentIds);
 
     /**
-     * 议题最新最热列表
+     * 移动端-议题最新最热列表
      * @Params: [formDto]
      * @Return: java.util.List<com.elink.esua.epdc.dto.issue.result.IssueResultDTO>
      * @Author: liuchuang
@@ -108,4 +109,13 @@ public interface IssueDao extends BaseDao<IssueEntity> {
      */
     IssueDetailResultDTO selectOneIssueDetail(IssueDetailFormDTO formDto);
 
+    /**
+     * 移动端-议题处理进度
+     * @Params: [issueId]
+     * @Return: java.util.List<com.elink.esua.epdc.dto.issue.result.IssueHandleProgressResultDTO>
+     * @Author: liuchuang
+     * @Date: 2019/9/9 14:18
+     */
+    List<IssueHandleProgressResultDTO> selectListOfHandleProgress(String issueId);
+
 }

esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/issue/service/IssueService.java

@@ -31,6 +31,7 @@ import com.elink.esua.epdc.dto.issue.form.IssueFormDTO;
 import com.elink.esua.epdc.dto.issue.form.IssueWaitHandleSubmitFormDTO;
 import com.elink.esua.epdc.dto.issue.result.IssueCategoryStatisticsResultDTO;
 import com.elink.esua.epdc.dto.issue.result.IssueDetailResultDTO;
+import com.elink.esua.epdc.dto.issue.result.IssueHandleProgressResultDTO;
 import com.elink.esua.epdc.dto.issue.result.IssueResultDTO;
 import com.elink.esua.epdc.modules.issue.entity.IssueEntity;
 
@@ -176,4 +177,13 @@ public interface IssueService extends BaseService<IssueEntity> {
      * @Date: 2019/9/9 12:37
      */
     Result<IssueCategoryStatisticsResultDTO> getIssueCategoryStatistics(IssueCategoryStatisticsFormDTO formDto);
+
+    /**
+     * 议题处理进度
+     * @Params: [issueId]
+     * @Return: com.elink.esua.epdc.commons.tools.utils.Result<java.util.List<com.elink.esua.epdc.dto.issue.result.IssueHandleProgressResultDTO>>
+     * @Author: liuchuang
+     * @Date: 2019/9/9 13:34
+     */
+    Result<List<IssueHandleProgressResultDTO>> getIssueHandleProgress(String issueId);
 }

esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/issue/service/impl/IssueServiceImpl.java

@@ -36,6 +36,7 @@ import com.elink.esua.epdc.dto.issue.form.IssueFormDTO;
 import com.elink.esua.epdc.dto.issue.form.IssueWaitHandleSubmitFormDTO;
 import com.elink.esua.epdc.dto.issue.result.IssueCategoryStatisticsResultDTO;
 import com.elink.esua.epdc.dto.issue.result.IssueDetailResultDTO;
+import com.elink.esua.epdc.dto.issue.result.IssueHandleProgressResultDTO;
 import com.elink.esua.epdc.dto.issue.result.IssueResultDTO;
 import com.elink.esua.epdc.modules.events.service.EpdcEventsService;
 import com.elink.esua.epdc.modules.issue.dao.IssueDao;
@@ -226,6 +227,12 @@ public class IssueServiceImpl extends BaseServiceImpl<IssueDao, IssueEntity> imp
         return new Result<IssueCategoryStatisticsResultDTO>().ok(resultDTO);
     }
 
+    @Override
+    public Result<List<IssueHandleProgressResultDTO>> getIssueHandleProgress(String issueId) {
+        List<IssueHandleProgressResultDTO> progressResultDTOS = baseDao.selectListOfHandleProgress(issueId);
+        return new Result<List<IssueHandleProgressResultDTO>>().ok(progressResultDTOS);
+    }
+
     /**
      * 初始化项目
      * @Params: [issueEntity]

esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/issue/IssueDao.xml

@@ -288,4 +288,18 @@
         ORDER BY
             img.CREATED_TIME
     </select>
+
+    <select id="selectListOfHandleProgress" resultType="com.elink.esua.epdc.dto.issue.result.IssueHandleProgressResultDTO">
+        SELECT
+            CREATED_TIME AS createdTime,
+            advice,
+            case STATE WHEN 0 THEN '审核' WHEN 1 THEN '反馈' WHEN '2' THEN '关闭' ELSE '' END AS stateName
+        FROM
+            epdc_issue_handle
+        WHERE
+            DEL_FLAG = '0'
+            AND ISSUE_ID = #{issueId}
+        ORDER BY
+            CREATED_TIME DESC
+    </select>
 </mapper>