diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/result/ItemContentForPCEndResultDTO.java b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/result/ItemContentForPCEndResultDTO.java new file mode 100644 index 000000000..8baa04907 --- /dev/null +++ b/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 handleProgressResultDTOS; +} diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/controller/ItemController.java b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/controller/ItemController.java index 0e2375b28..53f3bd6ee 100755 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/controller/ItemController.java +++ b/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 * @Author: liuchuang @@ -120,4 +121,17 @@ public class ItemController { return itemService.modifyHandleResult(dto); } + /** + * 项目内容详情 + * @Params: [id] + * @Return: com.elink.esua.epdc.commons.tools.utils.Result + * @Author: liuchuang + * @Date: 2019/9/16 9:56 + */ + @GetMapping("contentDetail/{id}") + public Result getItemContentDetail(@PathVariable("id") String id){ + ItemContentForPCEndResultDTO data = itemService.getItemContentDetail(id); + return new Result().ok(data); + } + } diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/dao/ItemDao.java b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/dao/ItemDao.java index 82fca9412..ad7b0b4f9 100755 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/dao/ItemDao.java +++ b/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 { */ List 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); + } diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/ItemService.java b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/ItemService.java index aff54ddc5..0c6ceadf8 100755 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/ItemService.java +++ b/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 { * @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); } diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/ItemServiceImpl.java b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/ItemServiceImpl.java index e2dfcc634..6191073f7 100755 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/ItemServiceImpl.java +++ b/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 implem return new Result(); } + + @Override + public ItemContentForPCEndResultDTO getItemContentDetail(String itemId) { + // 详情 + ItemContentForPCEndResultDTO resultDTO = baseDao.selectItemContentForPCEnd(itemId); + //处理进度 + List handleProgressResultDTOS = this.listOfItemHandleProgress(itemId, 0); + resultDTO.setHandleProgressResultDTOS(handleProgressResultDTOS); + return resultDTO; + } } diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/item/ItemDao.xml b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/item/ItemDao.xml index 08495be18..a103ad46f 100755 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/item/ItemDao.xml +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/item/ItemDao.xml @@ -308,4 +308,22 @@ ORDER BY createdTime DESC + +