From e528c52e40e2029543309d7f87a39847f90b087a Mon Sep 17 00:00:00 2001 From: wxz Date: Thu, 11 May 2023 14:16:16 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90=E7=BA=A2=E8=89=B2=E4=BB=A3=E5=8A=9E?= =?UTF-8?q?=E3=80=91=E5=90=84=E7=A7=8D=E5=88=97=E8=A1=A8=EF=BC=9A=E5=A2=9E?= =?UTF-8?q?=E5=8A=A0=E9=99=84=E4=BB=B6=E8=BF=94=E5=9B=9E?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../agentservice/AgentServiceList4WorkPcResultDTO.java | 3 +++ .../agentservice/ResiMyCreatedAgentServiceResultDTO.java | 3 +++ .../epmet/service/impl/LingShanAgentServiceServiceImpl.java | 6 ++++++ 3 files changed, 12 insertions(+) diff --git a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/agentservice/AgentServiceList4WorkPcResultDTO.java b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/agentservice/AgentServiceList4WorkPcResultDTO.java index 00c4d6f08d..28691df4b1 100644 --- a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/agentservice/AgentServiceList4WorkPcResultDTO.java +++ b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/agentservice/AgentServiceList4WorkPcResultDTO.java @@ -4,6 +4,7 @@ import com.fasterxml.jackson.annotation.JsonFormat; import lombok.Data; import java.util.Date; +import java.util.List; /** * @Description PC工作端-服务列表 @@ -29,4 +30,6 @@ public class AgentServiceList4WorkPcResultDTO { private Integer satisfaction; private String content; + + private List attachments; } diff --git a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/agentservice/ResiMyCreatedAgentServiceResultDTO.java b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/agentservice/ResiMyCreatedAgentServiceResultDTO.java index b4db654125..8ff13ad941 100644 --- a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/agentservice/ResiMyCreatedAgentServiceResultDTO.java +++ b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/agentservice/ResiMyCreatedAgentServiceResultDTO.java @@ -4,6 +4,7 @@ import com.fasterxml.jackson.annotation.JsonFormat; import lombok.Data; import java.util.Date; +import java.util.List; @Data public class ResiMyCreatedAgentServiceResultDTO { @@ -42,4 +43,6 @@ public class ResiMyCreatedAgentServiceResultDTO { private String processStatusName; private Integer satisfaction; + + private List attachments; } diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/LingShanAgentServiceServiceImpl.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/LingShanAgentServiceServiceImpl.java index 734acf0e95..c31835cc02 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/LingShanAgentServiceServiceImpl.java +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/LingShanAgentServiceServiceImpl.java @@ -104,6 +104,9 @@ public class LingShanAgentServiceServiceImpl implements LingShanAgentServiceServ log.error("【红色待办】居民-我创建的列表：未找到服务类别数据:{}", e.getServiceCategory()); } + // 反序列化附件列表 + d.setAttachments(JSON.parseArray(e.getAttachments(), String.class)); + return d; }).collect(Collectors.toList()); @@ -325,6 +328,9 @@ public class LingShanAgentServiceServiceImpl implements LingShanAgentServiceServ d.setProcessTime(serviceEntity.getProcessTime()); } d.setSatisfaction(serviceEntity.getSatisfication()); + + // 反序列化附件列表 + d.setAttachments(JSON.parseArray(serviceEntity.getAttachments(), String.class)); return d; }).collect(Collectors.toList());