Merge branch 'lingshan_master' into dev

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<String> attachments;
 }

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;
+
+}

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<String> attachments;
 }

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<List<LingShanAgentServiceCategoryResultDTO>> listServiceCategories() {
+         List<LingShanAgentServiceCategoryResultDTO> l =  lingShanServiceAgentService.listServiceCategories();
+         return new Result<List<LingShanAgentServiceCategoryResultDTO>>().ok(l);
+    }
+
     /**
      * @description: 居民端-提交代办服务
      * @param form:

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<LingShanAgentServiceCategoryResultDTO> listServiceCategories();
 }

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<LingShanAgentServiceCategoryResultDTO> listServiceCategories() {
+        List<LingshanAgentServiceCategoryEntity> es = agentServiceCategoryDao.selectList(new LambdaQueryWrapper<>());
+        return ConvertUtils.sourceToTarget(es, LingShanAgentServiceCategoryResultDTO.class);
+    }
 
     @Override
     public void resiSubmit(AgentServiceResiSubmitFormDTO form) {
@@ -104,6 +110,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 +334,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());