From e528c52e40e2029543309d7f87a39847f90b087a Mon Sep 17 00:00:00 2001 From: wxz Date: Thu, 11 May 2023 14:16:16 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E3=80=90=E7=BA=A2=E8=89=B2=E4=BB=A3?= =?UTF-8?q?=E5=8A=9E=E3=80=91=E5=90=84=E7=A7=8D=E5=88=97=E8=A1=A8=EF=BC=9A?= =?UTF-8?q?=E5=A2=9E=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()); From 1bddac93de874d1d1a7d4c99fc9652901eb1970a Mon Sep 17 00:00:00 2001 From: wxz Date: Thu, 11 May 2023 15:02:52 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E3=80=90=E7=BA=A2=E8=89=B2=E4=BB=A3?= =?UTF-8?q?=E5=8A=9E=E3=80=911.=E6=96=B0=E5=A2=9E=EF=BC=9A=E6=9C=8D?= =?UTF-8?q?=E5=8A=A1=E5=88=86=E7=B1=BB=E5=88=97=E8=A1=A8=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...LingShanAgentServiceCategoryResultDTO.java | 23 +++++++++++++++++++ .../LingShanAgentServiceController.java | 14 +++++++++++ .../service/LingShanAgentServiceService.java | 3 +++ .../impl/LingShanAgentServiceServiceImpl.java | 6 +++++ 4 files changed, 46 insertions(+) create mode 100644 epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/agentservice/LingShanAgentServiceCategoryResultDTO.java diff --git a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/agentservice/LingShanAgentServiceCategoryResultDTO.java b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/agentservice/LingShanAgentServiceCategoryResultDTO.java new file mode 100644 index 0000000000..c3a6bfc0c7 --- /dev/null +++ b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/agentservice/LingShanAgentServiceCategoryResultDTO.java @@ -0,0 +1,23 @@ +package com.epmet.dto.result.agentservice; + +import lombok.Data; + +@Data +public class LingShanAgentServiceCategoryResultDTO { + + /** + * 租户号 + */ + private String id; + + /** + * 类别名称 + */ + private String categoryName; + + /** + * 描述 + */ + private String description; + +} diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/LingShanAgentServiceController.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/LingShanAgentServiceController.java index 682d69c6d1..bff96e088f 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/LingShanAgentServiceController.java +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/LingShanAgentServiceController.java @@ -11,6 +11,7 @@ import com.epmet.commons.tools.validator.ValidatorUtils; import com.epmet.dto.form.agentservice.WorkCloseAgentServiceFormDTO; import com.epmet.dto.form.lingshan.AgentServiceResiSubmitFormDTO; import com.epmet.dto.result.agentservice.AgentServiceList4WorkPcResultDTO; +import com.epmet.dto.result.agentservice.LingShanAgentServiceCategoryResultDTO; import com.epmet.dto.result.agentservice.ResiMyCreatedAgentServiceResultDTO; import com.epmet.dto.result.agentservice.WorkServiceAgentResultDTO; import com.epmet.service.LingShanAgentServiceService; @@ -34,6 +35,19 @@ public class LingShanAgentServiceController { @Autowired private LingShanAgentServiceService lingShanServiceAgentService; + /** + * @Description: 服务分类 + * @param : + * @Return com.epmet.commons.tools.utils.Result + * @Author: wangxianzhang + * @Date: 2023/5/11 2:57 PM + */ + @GetMapping("serviceCategoryList") + public Result> listServiceCategories() { + List l = lingShanServiceAgentService.listServiceCategories(); + return new Result>().ok(l); + } + /** * @description: 居民端-提交代办服务 * @param form: diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/LingShanAgentServiceService.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/LingShanAgentServiceService.java index 22990448cf..f5c2d7ba47 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/LingShanAgentServiceService.java +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/LingShanAgentServiceService.java @@ -3,6 +3,7 @@ package com.epmet.service; import com.epmet.commons.tools.page.PageData; import com.epmet.dto.form.lingshan.AgentServiceResiSubmitFormDTO; import com.epmet.dto.result.agentservice.AgentServiceList4WorkPcResultDTO; +import com.epmet.dto.result.agentservice.LingShanAgentServiceCategoryResultDTO; import com.epmet.dto.result.agentservice.ResiMyCreatedAgentServiceResultDTO; import com.epmet.dto.result.agentservice.WorkServiceAgentResultDTO; @@ -28,4 +29,6 @@ public interface LingShanAgentServiceService { String agentName, Date processTimeStart, Date processTimeEnd, Integer pageNo, Integer pageSize); void workPcDelete(String id); + + List listServiceCategories(); } 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 c31835cc02..2a0c261b8b 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 @@ -25,6 +25,7 @@ import com.epmet.dao.LingshanAgentServiceRecordDao; import com.epmet.dto.form.lingshan.AgentServiceResiSubmitFormDTO; import com.epmet.dto.result.LoginUserDetailsResultDTO; import com.epmet.dto.result.agentservice.AgentServiceList4WorkPcResultDTO; +import com.epmet.dto.result.agentservice.LingShanAgentServiceCategoryResultDTO; import com.epmet.dto.result.agentservice.ResiMyCreatedAgentServiceResultDTO; import com.epmet.dto.result.agentservice.WorkServiceAgentResultDTO; import com.epmet.entity.LingshanAgentServiceCategoryEntity; @@ -61,6 +62,11 @@ public class LingShanAgentServiceServiceImpl implements LingShanAgentServiceServ public static final String AGENT_SERVICE_LOCK_PREFIX = "lingshan:agentservice:statuschange:"; + @Override + public List listServiceCategories() { + List es = agentServiceCategoryDao.selectList(new LambdaQueryWrapper<>()); + return ConvertUtils.sourceToTarget(es, LingShanAgentServiceCategoryResultDTO.class); + } @Override public void resiSubmit(AgentServiceResiSubmitFormDTO form) {