From 6cacf9c009989a927460ebceec3f8fc618dd970f Mon Sep 17 00:00:00 2001 From: liuchuang Date: Fri, 6 Sep 2019 11:10:14 +0800 Subject: [PATCH] =?UTF-8?q?=E8=AE=AE=E9=A2=98=E5=BE=85=E5=A4=84=E7=90=86?= =?UTF-8?q?=E8=AF=A6=E6=83=85=E6=95=B0=E6=8D=AE=20init?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../epdc/dto/events/EpdcEventsDetailDTO.java | 6 +--- .../epdc/dto/issue/IssueJobFeedbackDTO.java | 27 ++++++++++++++ .../dto/issue/IssueWaitHandleDetailDTO.java | 33 +++++++++++++++++ .../controller/EpdcEventsController.java | 1 - .../service/impl/EpdcEventsServiceImpl.java | 1 + .../issue/controller/IssueController.java | 7 ++++ .../esua/epdc/modules/issue/dao/IssueDao.java | 13 ++++++- .../modules/issue/entity/IssueEntity.java | 5 +++ .../modules/issue/service/IssueService.java | 10 ++++++ .../issue/service/impl/IssueServiceImpl.java | 6 ++++ .../epdc/modules/item/entity/ItemEntity.java | 5 +++ .../resources/mapper/events/EpdcEventsDao.xml | 2 +- .../main/resources/mapper/issue/IssueDao.xml | 36 +++++++++++++++++++ 13 files changed, 144 insertions(+), 8 deletions(-) create mode 100644 esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/issue/IssueJobFeedbackDTO.java create mode 100644 esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/issue/IssueWaitHandleDetailDTO.java diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/events/EpdcEventsDetailDTO.java b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/events/EpdcEventsDetailDTO.java index 3a59bdba1..e196c4d6e 100644 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/events/EpdcEventsDetailDTO.java +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/events/EpdcEventsDetailDTO.java @@ -33,11 +33,7 @@ public class EpdcEventsDetailDTO implements Serializable { /** * 图片 */ - private String images; - /** - * 图片数据 - */ - private String[] imageArray; + private List imageArray; /** * 事件地址 */ diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/issue/IssueJobFeedbackDTO.java b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/issue/IssueJobFeedbackDTO.java new file mode 100644 index 000000000..02039feb1 --- /dev/null +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/issue/IssueJobFeedbackDTO.java @@ -0,0 +1,27 @@ +package com.elink.esua.epdc.dto.issue; + +import lombok.Data; + +import java.io.Serializable; + +/** + * @Author LC + * @Date 2019/9/6 10:42 + */ +@Data +public class IssueJobFeedbackDTO implements Serializable { + private static final long serialVersionUID = 8884285160297991105L; + + /** + * 状态名称 + */ + private String stateName; + /** + * 审核或反馈时间 + */ + private String createdTime; + /** + * 意见 + */ + private String advice; +} diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/issue/IssueWaitHandleDetailDTO.java b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/issue/IssueWaitHandleDetailDTO.java new file mode 100644 index 000000000..46e10ad4f --- /dev/null +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/issue/IssueWaitHandleDetailDTO.java @@ -0,0 +1,33 @@ +package com.elink.esua.epdc.dto.issue; + +import lombok.Data; + +import java.io.Serializable; +import java.util.Date; +import java.util.List; + +/** + * @Author LC + * @Date 2019/9/6 10:36 + */ +@Data +public class IssueWaitHandleDetailDTO implements Serializable { + private static final long serialVersionUID = -8149882405346393016L; + + /** + * 发布人 + */ + private String nickName; + /** + * 发布时间 + */ + private Date distributeTime; + /** + * 议题内容 + */ + private String issueContent; + /** + * 工作反馈 + */ + List jobFeedbackDTOS; +} diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/events/controller/EpdcEventsController.java b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/events/controller/EpdcEventsController.java index 7c4eea614..fa0517c22 100644 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/events/controller/EpdcEventsController.java +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/events/controller/EpdcEventsController.java @@ -62,7 +62,6 @@ public class EpdcEventsController { @GetMapping("{id}") public Result get(@PathVariable("id") String id){ EpdcEventsDetailDTO data = epdcEventsService.getEvent(id); - data.setImageArray(data.getImages().split(",")); 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/events/service/impl/EpdcEventsServiceImpl.java b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/events/service/impl/EpdcEventsServiceImpl.java index 8000d6700..37fbf70ce 100644 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/events/service/impl/EpdcEventsServiceImpl.java +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/events/service/impl/EpdcEventsServiceImpl.java @@ -157,6 +157,7 @@ public class EpdcEventsServiceImpl extends BaseServiceImpl waitHandleIssueDetail(@PathVariable("id") String id) { + IssueWaitHandleDetailDTO data = issueService.getWaitHandleIssueDetail(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/issue/dao/IssueDao.java b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/issue/dao/IssueDao.java index c403a070b..f0a40618f 100644 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/issue/dao/IssueDao.java +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/issue/dao/IssueDao.java @@ -18,9 +18,11 @@ package com.elink.esua.epdc.modules.issue.dao; import com.elink.esua.epdc.commons.mybatis.dao.BaseDao; +import com.elink.esua.epdc.dto.issue.IssueWaitHandleDetailDTO; import com.elink.esua.epdc.dto.issue.IssueWaitHandleOrClosedDTO; import com.elink.esua.epdc.modules.issue.entity.IssueEntity; import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; import java.util.List; import java.util.Map; @@ -35,7 +37,7 @@ import java.util.Map; @Mapper public interface IssueDao extends BaseDao { /** - * 议题待处理列表 + * 议题待处理、已关闭、已转项目列表 * @Params: [startTime, endTime, curPage, pageSize] * @Return: java.util.List * @Author: liuchuang @@ -43,4 +45,13 @@ public interface IssueDao extends BaseDao { */ List selectListOfIssueWaitHandleOrClosed(Map params); + /** + * 议题待处理列表详情 + * @Params: [id] + * @Return: java.util.List + * @Author: liuchuang + * @Date: 2019/9/6 10:51 + */ + IssueWaitHandleDetailDTO selectOneOfWaitHandleIssueDetail(@Param("id") String id); + } diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/issue/entity/IssueEntity.java b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/issue/entity/IssueEntity.java index 3a53eb2cd..027b27a3f 100644 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/issue/entity/IssueEntity.java +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/issue/entity/IssueEntity.java @@ -64,6 +64,11 @@ public class IssueEntity extends BaseEpdcEntity { */ private String issueContent; + /** + * 发布时间 + */ + private Date distributeTime; + /** * 区 */ diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/issue/service/IssueService.java b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/issue/service/IssueService.java index 19a30acdf..a3105d282 100644 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/issue/service/IssueService.java +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/issue/service/IssueService.java @@ -20,6 +20,7 @@ package com.elink.esua.epdc.modules.issue.service; import com.elink.esua.epdc.commons.mybatis.service.BaseService; import com.elink.esua.epdc.commons.tools.page.PageData; import com.elink.esua.epdc.dto.issue.IssueDTO; +import com.elink.esua.epdc.dto.issue.IssueWaitHandleDetailDTO; import com.elink.esua.epdc.dto.issue.IssueWaitHandleOrClosedDTO; import com.elink.esua.epdc.modules.issue.entity.IssueEntity; @@ -93,4 +94,13 @@ public interface IssueService extends BaseService { * @date */ void delete(String[] ids); + + /** + * 议题待处理列表详情 + * @Params: [id] + * @Return: com.elink.esua.epdc.dto.issue.IssueWaitHandleDetailDTO + * @Author: liuchuang + * @Date: 2019/9/6 10:55 + */ + IssueWaitHandleDetailDTO getWaitHandleIssueDetail(String id); } diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/issue/service/impl/IssueServiceImpl.java b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/issue/service/impl/IssueServiceImpl.java index 059ac1e27..963218c2e 100644 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/issue/service/impl/IssueServiceImpl.java +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/issue/service/impl/IssueServiceImpl.java @@ -24,6 +24,7 @@ import com.elink.esua.epdc.commons.tools.constant.FieldConstant; import com.elink.esua.epdc.commons.tools.page.PageData; import com.elink.esua.epdc.commons.tools.utils.ConvertUtils; import com.elink.esua.epdc.dto.issue.IssueDTO; +import com.elink.esua.epdc.dto.issue.IssueWaitHandleDetailDTO; import com.elink.esua.epdc.dto.issue.IssueWaitHandleOrClosedDTO; import com.elink.esua.epdc.modules.issue.dao.IssueDao; import com.elink.esua.epdc.modules.issue.entity.IssueEntity; @@ -95,4 +96,9 @@ public class IssueServiceImpl extends BaseServiceImpl imp baseDao.deleteBatchIds(Arrays.asList(ids)); } + @Override + public IssueWaitHandleDetailDTO getWaitHandleIssueDetail(String id) { + return baseDao.selectOneOfWaitHandleIssueDetail(id); + } + } diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/entity/ItemEntity.java b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/entity/ItemEntity.java index e766df97e..973b8fb70 100755 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/entity/ItemEntity.java +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/entity/ItemEntity.java @@ -69,6 +69,11 @@ public class ItemEntity extends BaseEpdcEntity { */ private String issueContent; + /** + * 发布时间 + */ + private Date distributeTime; + /** * 区 */ diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/events/EpdcEventsDao.xml b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/events/EpdcEventsDao.xml index bf44c886d..6c6d3c906 100644 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/events/EpdcEventsDao.xml +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/events/EpdcEventsDao.xml @@ -8,7 +8,7 @@ - + diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/issue/IssueDao.xml b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/issue/IssueDao.xml index 9bf4a19d6..16bfb8791 100644 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/issue/IssueDao.xml +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/issue/IssueDao.xml @@ -29,4 +29,40 @@ ORDER BY issue.CREATED_TIME DESC + + + + + + + + + + + + +