From 8b15a098a97d205fe5c52879c624f5052f4c31b4 Mon Sep 17 00:00:00 2001 From: liuchuang Date: Mon, 25 Nov 2019 09:41:15 +0800 Subject: [PATCH] =?UTF-8?q?=E5=85=9A=E7=BE=A4=E8=AE=AE=E4=BA=8B=E5=A4=84?= =?UTF-8?q?=E7=90=86=E8=BF=9B=E5=BA=A6=E6=A8=A1=E5=9D=97=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../epdc/controller/ApiTopicController.java | 4 +- .../epdc/dto/issue/IssueContentDetailDTO.java | 18 ++++-- .../epdc/dto/issue/IssueJobFeedbackDTO.java | 4 ++ .../dto/issue/IssueWaitHandleDetailDTO.java | 10 +-- .../issue/result/IssueProgressResultDTO.java | 7 ++- .../result/ItemContentForPCEndResultDTO.java | 7 ++- .../result/ItemHandleProgressResultDTO.java | 3 +- .../esua/epdc/modules/issue/dao/IssueDao.java | 10 --- .../issue/service/impl/IssueServiceImpl.java | 27 +++++--- .../item/controller/WorkItemController.java | 7 +-- .../modules/item/service/ItemService.java | 4 +- .../item/service/impl/ItemServiceImpl.java | 5 +- .../main/resources/mapper/issue/IssueDao.xml | 63 ++----------------- .../main/resources/mapper/item/ItemDao.xml | 19 ++---- 14 files changed, 71 insertions(+), 117 deletions(-) diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiTopicController.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiTopicController.java index 401ee3294..ae6dcf981 100644 --- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiTopicController.java +++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiTopicController.java @@ -56,7 +56,7 @@ public class ApiTopicController { * @since 2019/11/11 15:04 */ @GetMapping("list") - public Result> listTopic(@LoginUser TokenDto userDetail, @RequestBody TopicListFormDTO formDto) { + public Result> listTopic(@LoginUser TokenDto userDetail, TopicListFormDTO formDto) { ValidatorUtils.validateEntity(formDto); return topicService.listOfTopic(userDetail, formDto); } @@ -71,7 +71,7 @@ public class ApiTopicController { * @since 2019/11/11 15:04 */ @GetMapping("listOfMine") - public Result> listTopicOfMine(@LoginUser TokenDto userDetail, @RequestBody TopicListFormDTO formDto) { + public Result> listTopicOfMine(@LoginUser TokenDto userDetail, TopicListFormDTO formDto) { ValidatorUtils.validateEntity(formDto); return topicService.listTopicOfMine(userDetail, formDto); } diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/issue/IssueContentDetailDTO.java b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/issue/IssueContentDetailDTO.java index dfb3804c9..719515a6c 100644 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/issue/IssueContentDetailDTO.java +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/issue/IssueContentDetailDTO.java @@ -1,10 +1,10 @@ package com.elink.esua.epdc.dto.issue; -import com.elink.esua.epdc.dto.events.EpdcEventsCommentsDTO; +import com.elink.esua.epdc.dto.issue.result.IssueProgressResultDTO; +import com.elink.esua.epdc.dto.item.result.ItemHandleProgressResultDTO; import lombok.Data; import java.io.Serializable; -import java.math.BigDecimal; import java.util.Date; import java.util.List; @@ -48,10 +48,6 @@ public class IssueContentDetailDTO implements Serializable { * 图片 */ private List images; - /** - * 工作反馈或处理进度 - */ - private List feedbackDTOList; /** * 事件地址 */ @@ -72,4 +68,14 @@ public class IssueContentDetailDTO implements Serializable { * 所属类别 */ private String categoryName; + + /** + * 议题处理进度 + */ + List issueProgressResultDTOS; + + /** + * 项目处理进度 + */ + List handleProgressResultDTOS; } 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 index bb6d51a73..452b62aee 100644 --- 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 @@ -14,6 +14,10 @@ import java.util.Date; public class IssueJobFeedbackDTO implements Serializable { private static final long serialVersionUID = 8884285160297991105L; + /** + * 状态 + */ + private Integer state; /** * 状态名称 */ 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 index 36e24bc8f..859c2b4b9 100644 --- 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 @@ -1,9 +1,9 @@ package com.elink.esua.epdc.dto.issue; +import com.elink.esua.epdc.dto.issue.result.IssueProgressResultDTO; import lombok.Data; import java.io.Serializable; -import java.math.BigDecimal; import java.util.Date; import java.util.List; @@ -40,10 +40,6 @@ public class IssueWaitHandleDetailDTO implements Serializable { * 图片 */ private List images; - /** - * 工作反馈 - */ - List jobFeedbackDTOS; /** * 事件地址 */ @@ -64,4 +60,8 @@ public class IssueWaitHandleDetailDTO implements Serializable { * 类别 */ private String categoryName; + /** + * 议题处理进度 + */ + List issueProgressResultDTOS; } diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/issue/result/IssueProgressResultDTO.java b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/issue/result/IssueProgressResultDTO.java index 659d762e2..f57a6c1dd 100644 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/issue/result/IssueProgressResultDTO.java +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/issue/result/IssueProgressResultDTO.java @@ -16,10 +16,15 @@ import java.util.List; public class IssueProgressResultDTO implements Serializable { private static final long serialVersionUID = 2739821096656995025L; + /** + * 处理进度ID + */ + private String id; + /** * 状态 */ - private String state; + private Integer state; /** * 时间 */ 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 index 3a4ce8bd3..f57147327 100644 --- 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 @@ -4,7 +4,6 @@ import com.elink.esua.epdc.dto.issue.result.IssueProgressResultDTO; import lombok.Data; import java.io.Serializable; -import java.math.BigDecimal; import java.util.Date; import java.util.List; @@ -67,9 +66,13 @@ public class ItemContentForPCEndResultDTO implements Serializable { */ private List images; /** - * 项目满意度 + * 用户满意度评价 */ private String evaluationScore; + /** + * 用户满意度评价内容 + */ + private String evaluationContent; /** * 部门满意度评价 */ diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/result/ItemHandleProgressResultDTO.java b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/result/ItemHandleProgressResultDTO.java index 7e069e454..a0a90c953 100644 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/result/ItemHandleProgressResultDTO.java +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/result/ItemHandleProgressResultDTO.java @@ -15,6 +15,7 @@ import java.util.List; public class ItemHandleProgressResultDTO implements Serializable { private static final long serialVersionUID = -7709510043792716588L; + private String id; /** * 状态名称 */ @@ -22,7 +23,7 @@ public class ItemHandleProgressResultDTO implements Serializable { /** * 状态 */ - private String state; + private Integer state; /** * 时间 */ 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 375501dae..1e9e4b99b 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 @@ -19,7 +19,6 @@ package com.elink.esua.epdc.modules.issue.dao; import com.elink.esua.epdc.commons.mybatis.dao.BaseDao; import com.elink.esua.epdc.dto.issue.IssueContentDetailDTO; -import com.elink.esua.epdc.dto.issue.IssueJobFeedbackDTO; import com.elink.esua.epdc.dto.issue.IssueWaitHandleDetailDTO; import com.elink.esua.epdc.dto.issue.IssueWaitHandleOrClosedDTO; import com.elink.esua.epdc.dto.issue.form.*; @@ -67,15 +66,6 @@ public interface IssueDao extends BaseDao { */ IssueContentDetailDTO selectOneIssueContentDetail(@Param("issueId") String issueId); - /** - * 工作反馈和处理进度集合 - * @Params: [issueId, itemId] - * @Return: java.util.List - * @Author: liuchuang - * @Date: 2019/9/6 16:43 - */ - List selectListOfJobFeedBack(@Param("issueId") String issueId, @Param("itemId") String itemId); - /** * 屏蔽评论 * @Params: [commentId] 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 35e69b3c7..433544630 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 @@ -40,6 +40,8 @@ import com.elink.esua.epdc.dto.events.result.EventAppDetailResultDTO; import com.elink.esua.epdc.dto.issue.*; import com.elink.esua.epdc.dto.issue.form.*; import com.elink.esua.epdc.dto.issue.result.*; +import com.elink.esua.epdc.dto.item.form.ItemProcessFormDTO; +import com.elink.esua.epdc.dto.item.result.ItemHandleProgressResultDTO; import com.elink.esua.epdc.modules.async.DeptRespondTask; import com.elink.esua.epdc.modules.async.NewsTask; import com.elink.esua.epdc.modules.comment.service.EventCommentService; @@ -156,7 +158,13 @@ public class IssueServiceImpl extends BaseServiceImpl imp @Override public IssueWaitHandleDetailDTO getWaitHandleIssueDetail(String id) { - return baseDao.selectOneOfWaitHandleIssueDetail(id); + // 议题详情 + IssueWaitHandleDetailDTO detailDto = baseDao.selectOneOfWaitHandleIssueDetail(id); + // 议题处理进度 + List issueProgressResultDTOS = this.listIssueProgress(id); + detailDto.setIssueProgressResultDTOS(issueProgressResultDTOS); + + return detailDto; } @Override @@ -256,18 +264,19 @@ public class IssueServiceImpl extends BaseServiceImpl imp @Override public IssueContentDetailDTO getIssueContentDetail(String issueId) { - // 项目信息 + // 议题详情 + IssueContentDetailDTO data = baseDao.selectOneIssueContentDetail(issueId); + // 议题处理进度 + List issueProgressResult = this.listIssueProgress(issueId); + data.setIssueProgressResultDTOS(issueProgressResult); + ItemEntity itemEntity = itemService.getItemByIssueId(issueId); - String itemId = ""; if (null != itemEntity) { - itemId = itemEntity.getId(); + // 项目处理进度 + List handleProgressResult = itemService.listOfItemHandleProgressByWork(itemEntity.getId()); + data.setHandleProgressResultDTOS(handleProgressResult); } - // 议题详情 - IssueContentDetailDTO data = baseDao.selectOneIssueContentDetail(issueId); - // 反馈和处理进度 - List feedbackDTOList = baseDao.selectListOfJobFeedBack(issueId, itemId); - data.setFeedbackDTOList(feedbackDTOList); return data; } diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/controller/WorkItemController.java b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/controller/WorkItemController.java index b88232e70..5677aa528 100644 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/controller/WorkItemController.java +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/controller/WorkItemController.java @@ -1,14 +1,11 @@ package com.elink.esua.epdc.modules.item.controller; -import com.elink.esua.epdc.commons.tools.constant.Constant; import com.elink.esua.epdc.commons.tools.security.user.SecurityUser; import com.elink.esua.epdc.commons.tools.utils.Result; import com.elink.esua.epdc.commons.tools.validator.ValidatorUtils; -import com.elink.esua.epdc.dto.SysDeptDTO; import com.elink.esua.epdc.dto.item.ItemEvaluateDeptDTO; import com.elink.esua.epdc.dto.item.form.*; import com.elink.esua.epdc.dto.item.result.*; -import com.elink.esua.epdc.modules.feign.AdminFeignClient; import com.elink.esua.epdc.modules.item.service.ItemDeptService; import com.elink.esua.epdc.modules.item.service.ItemEvaluateDeptService; import com.elink.esua.epdc.modules.item.service.ItemInformationService; @@ -16,7 +13,6 @@ import com.elink.esua.epdc.modules.item.service.ItemService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; -import java.util.ArrayList; import java.util.List; /** @@ -149,6 +145,7 @@ public class WorkItemController { @GetMapping("processList") public Result> processList(@RequestBody ItemProcessFormDTO formDTO) { ValidatorUtils.validateEntity(formDTO); - return itemService.listOfItemHandleProgressByWork(formDTO); + List data = itemService.listOfItemHandleProgressByWork(formDTO.getItemId()); + return new Result>().ok(data); } } \ No newline at end of file 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 fb9490db6..7c73c05d9 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 @@ -273,10 +273,10 @@ public interface ItemService extends BaseService { /** * 项目处理进度 - * @Params: [formDto] + * @Params: [itemId] * @Return: com.elink.esua.epdc.commons.tools.utils.Result * @Author: lipengfei * @Date: 2019/11/18 13:32 */ - Result> listOfItemHandleProgressByWork(ItemProcessFormDTO formDTO); + List listOfItemHandleProgressByWork(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 02e689cdb..c38da3484 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 @@ -487,9 +487,8 @@ public class ItemServiceImpl extends BaseServiceImpl implem return baseDao.selectListOfItemHandleProgress(entity.getIssueId(), itemId, outOrInside); } @Override - public Result> listOfItemHandleProgressByWork(ItemProcessFormDTO formDTO) { - List data = baseDao.selectListOfItemHandleProgressByWork(formDTO.getItemId()); - return new Result>().ok(data); + public List listOfItemHandleProgressByWork(String itemId) { + return baseDao.selectListOfItemHandleProgressByWork(itemId); } 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 f588d6f2b..84da52b68 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 @@ -50,12 +50,6 @@ - - - - - - @@ -143,41 +123,6 @@ ORDER BY img.CREATED_TIME - - UPDATE epdc_event_comment SET SHIELD_FLAG = '1' WHERE ID IN + @@ -365,6 +311,7 @@ + @@ -566,6 +567,7 @@ @@ -611,6 +600,7 @@ + @@ -636,6 +626,7 @@ WHEN 2 THEN '非常满意' ELSE '' END AS evaluationScore, + item.EVALUATION_CONTENT, img.IMG_URL FROM epdc_item item