项目内容详情 init

esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/result/ItemContentForPCEndResultDTO.java

@@ -0,0 +1,50 @@
+package com.elink.esua.epdc.dto.item.result;
+
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+import java.util.List;
+
+/**
+ * 项目内容详情
+ * @Author LC
+ * @Date 2019/9/17 10:29
+ */
+@Data
+public class ItemContentForPCEndResultDTO implements Serializable {
+    private static final long serialVersionUID = -3308945440267200297L;
+
+    /**
+     * 项目ID
+     */
+    private String id;
+    /**
+     * 发布人
+     */
+    private String nickName;
+    /**
+     * 发布时间
+     */
+    private Date distributeTime;
+    /**
+     * 项目内容
+     */
+    private String itemContent;
+    /**
+     * 支持数
+     */
+    private Integer approveNum;
+    /**
+     * 反对数
+     */
+    private Integer opposeNum;
+    /**
+     * 评论数
+     */
+    private Integer commentNum;
+    /**
+     * 项目处理进度
+     */
+    private List<ItemHandleProgressResultDTO> handleProgressResultDTOS;
+}

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

@@ -28,6 +28,7 @@ import com.elink.esua.epdc.commons.tools.validator.group.DefaultGroup;
 import com.elink.esua.epdc.dto.item.ItemDTO;
 import com.elink.esua.epdc.dto.item.ItemPendingHandleDTO;
 import com.elink.esua.epdc.dto.item.form.ItemHandleSubmitFormDTO;
+import com.elink.esua.epdc.dto.item.result.ItemContentForPCEndResultDTO;
 import com.elink.esua.epdc.dto.item.result.ItemDetailForPCEndResultDTO;
 import com.elink.esua.epdc.modules.item.excel.ItemExcel;
 import com.elink.esua.epdc.modules.item.service.ItemService;
@@ -66,7 +67,7 @@ public class ItemController {
     }
 
     /**
-     * 项目详情
+     * 项目处理详情
      * @Params: [id]
      * @Return: com.elink.esua.epdc.commons.tools.utils.Result<com.elink.esua.epdc.dto.item.ItemDTO>
      * @Author: liuchuang
@@ -120,4 +121,17 @@ public class ItemController {
         return itemService.modifyHandleResult(dto);
     }
 
+    /**
+     * 项目内容详情
+     * @Params: [id]
+     * @Return: com.elink.esua.epdc.commons.tools.utils.Result<com.elink.esua.epdc.dto.item.ItemDTO>
+     * @Author: liuchuang
+     * @Date: 2019/9/16 9:56
+     */
+    @GetMapping("contentDetail/{id}")
+    public Result<ItemContentForPCEndResultDTO> getItemContentDetail(@PathVariable("id") String id){
+        ItemContentForPCEndResultDTO data = itemService.getItemContentDetail(id);
+        return new Result<ItemContentForPCEndResultDTO>().ok(data);
+    }
+
 }

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

@@ -103,4 +103,13 @@ public interface ItemDao extends BaseDao<ItemEntity> {
      */
     List<ItemHandleProgressResultDTO> selectListOfItemHandleProgress(String issueId, String itemId, int outOrInside);
 
+    /**
+     * 项目内容详情
+     * @Params: [itemId]
+     * @Return: com.elink.esua.epdc.dto.item.result.ItemContentForPCEndResultDTO
+     * @Author: liuchuang
+     * @Date: 2019/9/17 10:37
+     */
+    ItemContentForPCEndResultDTO  selectItemContentForPCEnd(String itemId);
+
 }

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

@@ -171,4 +171,13 @@ public interface ItemService extends BaseService<ItemEntity> {
      * @Date: 2019/9/16 19:10
      */
     Result modifyHandleResult(ItemHandleSubmitFormDTO dto);
+
+    /**
+     * 项目内容详情
+     * @Params: [itemId]
+     * @Return: com.elink.esua.epdc.dto.item.result.ItemContentForPCEndResultDTO
+     * @Author: liuchuang
+     * @Date: 2019/9/17 10:38
+     */
+    ItemContentForPCEndResultDTO getItemContentDetail(String itemId);
 }

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

@@ -442,4 +442,14 @@ public class ItemServiceImpl extends BaseServiceImpl<ItemDao, ItemEntity> implem
 
         return new Result();
     }
+
+    @Override
+    public ItemContentForPCEndResultDTO getItemContentDetail(String itemId) {
+        // 详情
+        ItemContentForPCEndResultDTO resultDTO = baseDao.selectItemContentForPCEnd(itemId);
+        //处理进度
+        List<ItemHandleProgressResultDTO> handleProgressResultDTOS = this.listOfItemHandleProgress(itemId, 0);
+        resultDTO.setHandleProgressResultDTOS(handleProgressResultDTOS);
+        return resultDTO;
+    }
 }

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

@@ -308,4 +308,22 @@
         ORDER BY
             createdTime DESC
     </select>
+
+    <select id="selectItemContentForPCEnd" resultType="com.elink.esua.epdc.dto.item.result.ItemContentForPCEndResultDTO">
+        SELECT
+            item.ID,
+            item.NICK_NAME,
+            item.DISTRIBUTE_TIME,
+            item.ITEM_CONTENT,
+            eve.APPROVE_NUM,
+            eve.OPPOSE_NUM,
+            eve.COMMENT_NUM
+        FROM
+            epdc_item item
+            LEFT JOIN epdc_events eve ON item.EVENT_ID = eve.ID
+            AND eve.DEL_FLAG = '0'
+        WHERE
+            item.DEL_FLAG = '0'
+            AND item.ID = #{itemId}
+    </select>
 </mapper>