新增居民端议题和项目处理进度V2版本接口

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

@@ -0,0 +1,47 @@
+package com.elink.esua.epdc.controller.v2;
+
+import com.elink.esua.epdc.commons.api.version.ApiVersion;
+import com.elink.esua.epdc.commons.tools.constant.Constant;
+import com.elink.esua.epdc.commons.tools.utils.Result;
+import com.elink.esua.epdc.dto.issue.form.WorkProcessListFormDTO;
+import com.elink.esua.epdc.dto.issue.result.IssueProgressResultDTO;
+import com.elink.esua.epdc.service.WorkIssueService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.List;
+
+/**
+ *
+ * 议题管理-V2
+ *
+ * @Author：liuchuang
+ * @Date：2019/12/23 19:44
+ */
+@ApiVersion(2)
+@RestController("ApiIssueV2Controller")
+@RequestMapping("events/issue" + Constant.VERSION_CONTROL)
+public class ApiIssueV2Controller {
+
+    @Autowired
+    private WorkIssueService workIssueService;
+
+    /**
+     *
+     * 议题处理进度
+     *
+     * @params [issueId]
+     * @return com.elink.esua.epdc.commons.tools.utils.Result<java.util.List<com.elink.esua.epdc.dto.issue.result.IssueProgressResultDTO>>
+     * @author liuchuang
+     * @since 2019/12/23 19:46
+     */
+    @GetMapping("progress/{issueId}")
+    public Result<List<IssueProgressResultDTO>> issueHandleProgress(@PathVariable String issueId) {
+        WorkProcessListFormDTO formDto = new WorkProcessListFormDTO();
+        formDto.setIssueId(issueId);
+        return workIssueService.processList(formDto);
+    }
+}

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

@@ -0,0 +1,44 @@
+package com.elink.esua.epdc.controller.v2;
+
+import com.elink.esua.epdc.commons.api.version.ApiVersion;
+import com.elink.esua.epdc.commons.tools.constant.Constant;
+import com.elink.esua.epdc.commons.tools.utils.Result;
+import com.elink.esua.epdc.dto.item.result.ItemHandleProgressResultDTO;
+import com.elink.esua.epdc.service.ItemService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.List;
+
+/**
+ *
+ * 移动端-项目模块-V2
+ *
+ * @Author：liuchuang
+ * @Date：2019/12/24 9:15
+ */
+@ApiVersion(2)
+@RestController("ApiItemV2Controller")
+@RequestMapping("events/item" + Constant.VERSION_CONTROL)
+public class ApiItemV2Controller {
+
+    @Autowired
+    private ItemService itemService;
+
+    /**
+     *
+     * 项目处理进度
+     *
+     * @params [itemId]
+     * @return com.elink.esua.epdc.commons.tools.utils.Result<java.util.List<com.elink.esua.epdc.dto.item.result.ItemHandleProgressResultDTO>>
+     * @author liuchuang
+     * @since 2019/12/24 9:17
+     */
+    @GetMapping("progress/{itemId}")
+    public Result<List<ItemHandleProgressResultDTO>> itemHandleProgress(@PathVariable String itemId) {
+        return itemService.getItemHandleV2Progress(itemId);
+    }
+}

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

@@ -77,4 +77,16 @@ public interface ItemFeignClient {
      */
     @GetMapping(value = "events/epdc-app/item/listByUserId", consumes = MediaType.APPLICATION_JSON_VALUE)
     Result<List<ItemResultDTO>> listItemsOfMine(ItemOfMineFormDTO formDTO);
+
+    /**
+     *
+     * 项目处理进度-V2
+     *
+     * @params [itemId]
+     * @return com.elink.esua.epdc.commons.tools.utils.Result<java.util.List<com.elink.esua.epdc.dto.item.result.ItemHandleProgressResultDTO>>
+     * @author liuchuang
+     * @since 2019/12/24 9:19
+     */
+    @GetMapping(value = "events/epdc-app/item/v2/progress/{itemId}", consumes = MediaType.APPLICATION_JSON_VALUE)
+    Result<List<ItemHandleProgressResultDTO>> itemHandleV2Progress(@PathVariable String itemId);
 }

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

@@ -50,4 +50,9 @@ public class ItemFeignClientFallback implements ItemFeignClient {
     public Result<List<ItemResultDTO>> listItemsOfMine(ItemOfMineFormDTO formDTO) {
         return ModuleUtils.feignConError(ServiceConstant.EPDC_EVENTS_SERVER, "listItemsOfMine", formDTO);
     }
+
+    @Override
+    public Result<List<ItemHandleProgressResultDTO>> itemHandleV2Progress(String itemId) {
+        return ModuleUtils.feignConError(ServiceConstant.EPDC_EVENTS_SERVER, "itemHandleV2Progress", itemId);
+    }
 }

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

@@ -66,4 +66,15 @@ public interface ItemService {
      * @Date: 2019/9/17 13:27
      */
     Result<List<ItemResultDTO>> listItemsOfMine(TokenDto userDetail, ItemOfMineFormDTO formDTO);
+
+    /**
+     *
+     * 项目处理进度
+     *
+     * @params [itemId]
+     * @return com.elink.esua.epdc.commons.tools.utils.Result<java.util.List<com.elink.esua.epdc.dto.item.result.ItemHandleProgressResultDTO>>
+     * @author liuchuang
+     * @since 2019/12/24 9:18
+     */
+    Result<List<ItemHandleProgressResultDTO>> getItemHandleV2Progress(String itemId);
 }

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

@@ -81,4 +81,9 @@ public class ItemServiceImpl implements ItemService {
         formDTO.setUserId(userDetail.getUserId());
         return itemFeignClient.listItemsOfMine(formDTO);
     }
+
+    @Override
+    public Result<List<ItemHandleProgressResultDTO>> getItemHandleV2Progress(String itemId) {
+        return itemFeignClient.itemHandleV2Progress(itemId);
+    }
 }

esua-epdc/epdc-module/epdc-events/epdc-events-server/pom.xml

@@ -62,6 +62,12 @@
             <version>1.0.0</version>
             <scope>compile</scope>
         </dependency>
+        <!--版本控制-->
+        <dependency>
+            <groupId>com.esua.epdc</groupId>
+            <artifactId>epdc-commons-api-version-control</artifactId>
+            <version>${project.version}</version>
+        </dependency>
     </dependencies>
 
     <build>

esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/comment/controller/AppEventCommentController.java

@@ -95,7 +95,7 @@ public class AppEventCommentController {
      * 事件评论回复列表接口
      */
     @GetMapping("commentReplyList")
-    public Result<WorkEventsCommentsDTO> commentReplyList(WorkCommentReplyFormDTO workCommentReplyFormDTO){
+    public Result<WorkEventsCommentsDTO> commentReplyList(@RequestBody WorkCommentReplyFormDTO workCommentReplyFormDTO){
         return eventCommentService.commentReplyList(workCommentReplyFormDTO);
     }
 }

esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/controller/v2/EpdcAppItemV2Controller.java

@@ -0,0 +1,45 @@
+package com.elink.esua.epdc.modules.item.controller.v2;
+
+import com.elink.esua.epdc.commons.api.version.ApiVersion;
+import com.elink.esua.epdc.commons.tools.constant.Constant;
+import com.elink.esua.epdc.commons.tools.utils.Result;
+import com.elink.esua.epdc.dto.item.result.ItemHandleProgressResultDTO;
+import com.elink.esua.epdc.modules.item.service.ItemService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.List;
+
+/**
+ *
+ * 移动端-项目管理-V2
+ *
+ * @Author：liuchuang
+ * @Date：2019/12/24 9:08
+ */
+@ApiVersion(2)
+@RestController("EpdcAppItemV2Controller")
+@RequestMapping(Constant.EPDC_APP + "item" + Constant.VERSION_CONTROL)
+public class EpdcAppItemV2Controller {
+
+    @Autowired
+    private ItemService itemService;
+
+    /**
+     *
+     * 项目处理进度
+     *
+     * @params [itemId]
+     * @return com.elink.esua.epdc.commons.tools.utils.Result<java.util.List<com.elink.esua.epdc.dto.item.result.ItemHandleProgressResultDTO>>
+     * @author liuchuang
+     * @since 2019/12/24 9:12
+     */
+    @GetMapping("progress/{itemId}")
+    public Result<List<ItemHandleProgressResultDTO>> itemHandleProgress(@PathVariable String itemId) {
+        List<ItemHandleProgressResultDTO> data = this.itemService.listOfItemHandleProgressByMobile(itemId);
+        return new Result<List<ItemHandleProgressResultDTO>>().ok(data);
+    }
+}

esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/dao/ItemDao.java

@@ -144,6 +144,17 @@ public interface ItemDao extends BaseDao<ItemEntity> {
      */
     List<ItemHandleProgressResultDTO> selectListOfItemHandleProgressByWork(String itemId);
 
+    /**
+     *
+     * 居民端项目处理进度
+     *
+     * @params [itemId]
+     * @return java.util.List<com.elink.esua.epdc.dto.item.result.ItemHandleProgressResultDTO>
+     * @author liuchuang
+     * @since 2019/12/23 20:08
+     */
+    List<ItemHandleProgressResultDTO> selectListOfItemHandleProgressByMobile(String itemId);
+
     /**
      * 项目内容详情
      * @Params: [itemId]

esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/ItemService.java

@@ -279,4 +279,15 @@ public interface ItemService extends BaseService<ItemEntity> {
      * @Date: 2019/11/18 13:32
      */
     List<ItemHandleProgressResultDTO> listOfItemHandleProgressByWork(String itemId);
+
+    /**
+     *
+     * 项目处理进度-居民端
+     *
+     * @params [itemId]
+     * @return java.util.List<com.elink.esua.epdc.dto.item.result.ItemHandleProgressResultDTO>
+     * @author liuchuang
+     * @since 2019/12/24 9:03
+     */
+    List<ItemHandleProgressResultDTO> listOfItemHandleProgressByMobile(String itemId);
 }

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

@@ -497,11 +497,16 @@ public class ItemServiceImpl extends BaseServiceImpl<ItemDao, ItemEntity> implem
         ItemEntity entity = this.selectById(itemId);
         return baseDao.selectListOfItemHandleProgress(entity.getIssueId(), itemId, outOrInside);
     }
+
     @Override
     public List<ItemHandleProgressResultDTO> listOfItemHandleProgressByWork(String itemId) {
         return baseDao.selectListOfItemHandleProgressByWork(itemId);
     }
 
+    @Override
+    public List<ItemHandleProgressResultDTO> listOfItemHandleProgressByMobile(String itemId) {
+        return baseDao.selectListOfItemHandleProgressByMobile(itemId);
+    }
 
     @Override
     @Transactional(rollbackFor = Exception.class)

esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/item/ItemDao.xml

@@ -600,6 +600,48 @@
         createdTime DESC
     </select>
 
+    <select id="selectListOfItemHandleProgressByMobile" resultMap="itemHandleMapByWork">
+        SELECT
+            hp.ID,
+            hp.CREATED_TIME AS createdTime,
+            hp.HANDLE_ADVICE AS advice,
+            hp.HANDLER_DEPT AS handlerDept,
+            hp.STATE,
+            itemDept.DEPT_NAME,
+            img.IMG_URL
+        FROM
+            epdc_item_handle_process hp
+            LEFT JOIN epdc_item_dept itemDept ON hp.ID = itemDept.ITEM_HANDLE_ID
+            LEFT JOIN epdc_img img ON hp.ID = img.REFERENCE_ID
+            AND IMG_TYPE = 'itemHandle'
+            AND img.DEL_FLAG = '0'
+        WHERE
+            hp.DEL_FLAG = '0'
+            AND hp.ITEM_ID = #{itemId} UNION ALL
+        SELECT
+            item.ID,
+            item.EVALUATION_TIME AS createdTime,
+            item.EVALUATION_CONTENT AS advice,
+            item.NICK_NAME AS handlerDept,
+        CASE
+                item.EVALUATION_SCORE
+                WHEN 0 THEN
+                11
+                WHEN 1 THEN
+                12 ELSE 13
+            END AS STATE,
+            NULL AS DEPT_NAME,
+            NULL AS IMG_URL
+        FROM
+            epdc_item item
+        WHERE
+            item.DEL_FLAG = '0'
+            AND item.ID = #{itemId}
+            AND item.EVALUATION_SCORE IS NOT NULL
+        ORDER BY
+            createdTime DESC
+    </select>
+
     <resultMap id="itemContentForPCEndMap" type="com.elink.esua.epdc.dto.item.result.ItemContentForPCEndResultDTO">
         <result property="id" column="ID"/>
         <result property="nickName" column="NICK_NAME"/>