Merge branch 'lingshan_master' into dev

# Conflicts:
#	epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/IcHouseListResultDTO.java

epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/agentservice/LingShanScreenServiceRstDTO.java

@@ -1,10 +1,14 @@
 package com.epmet.dto.result.agentservice;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
+import java.security.PrivateKey;
+import java.util.ArrayList;
 import java.util.Date;
+import java.util.List;
 
 @Data
 @AllArgsConstructor
@@ -13,8 +17,9 @@ public class LingShanScreenServiceRstDTO {
     private String content;
     private String applicantName;
     private String applicantMobile;
-    private String applicantHomeAddress;
+    private String exceptServeAddress;
     private Date createdTime;
+    private Date exceptServeTime;
     private String agentName;
     private String agentMobile;
 
@@ -26,4 +31,29 @@ public class LingShanScreenServiceRstDTO {
      * 纬度
      */
     private String latitude;
+
+    private String processTime;
+    private String processDesc;
+    private List<String> attachments;
+    private String processStatus;
+    private String closeDesc;
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date closeTime;
+    private Integer satisfication;
+
+    /**
+     * 处理进展
+     */
+    private List<ProcessNode> processNodes = new ArrayList<>();
+
+    @Data
+    @NoArgsConstructor
+    @AllArgsConstructor
+    public static class ProcessNode {
+        private Integer processType;
+        private String processTypeName;
+        private String processorName;
+        private String processDesc;
+        private List<String> processAttachments = new ArrayList<>();
+    }
 }

epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/LingShanAgentServiceController.java

@@ -286,6 +286,19 @@ public class LingShanAgentServiceController {
         return new Result<List<LingShanScreenServiceRstDTO>>().ok(rl);
     }
 
+    /**
+     * @Description: 中央大屏:服务详情
+     * @param id:
+     * @Return com.epmet.commons.tools.utils.Result<com.epmet.dto.result.agentservice.LingShanScreenServiceRstDTO>
+     * @Author: wangxianzhang
+     * @Date: 2023/5/17 2:40 PM
+     */
+    @GetMapping("screen/serviceDetail")
+    public Result<LingShanScreenServiceRstDTO> screenServiceDetail(@RequestParam("id") String id) {
+        LingShanScreenServiceRstDTO c = lingShanServiceAgentService.screenServiceDetail(id);
+        return new Result<LingShanScreenServiceRstDTO>().ok(c);
+    }
+
     /**
      * @Description: 服务类型数量分析
      * @param orgType:

epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/LingShanAgentServiceService.java

@@ -38,4 +38,6 @@ public interface LingShanAgentServiceService {
     List<ScreenAgentServiceCategoryAnalysisRstDTO> serviceCategoryAnalysis(String orgType, String orgId);
 
     List<AgentServiceTrendAnalysisRstDTO> serviceTrendAnalysis(String orgType, String orgId);
+
+    LingShanScreenServiceRstDTO screenServiceDetail(String id);
 }

epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/LingShanAgentServiceServiceImpl.java

@@ -513,7 +513,6 @@ public class LingShanAgentServiceServiceImpl implements LingShanAgentServiceServ
                 d.setAgentMobile(agentInfo.getMobile());
             }
 
-            // todo 此处要查什么？？申请人家庭住址？申请人家庭住址是什么？
             // IcResiUserDTO resiUser = getResultDataOrReturnNull(userOpenFeignClient.getIcResiUserDTO(rec.getApplicantId()), ServiceConstant.EPMET_USER_SERVER);
             // if (resiUser == null) {
             //     log.error("【灵山大屏】代办事件列表：查询申请人信息失败，申请人ID:" + rec.getApplicantId());
@@ -527,6 +526,8 @@ public class LingShanAgentServiceServiceImpl implements LingShanAgentServiceServ
             // }
 
             d.setContent(rec.getContent());
+            d.setExceptServeAddress(rec.getExceptServeAddress());
+            d.setExceptServeTime(rec.getExceptServeTime());
             d.setCreatedTime(rec.getCreatedTime());
             d.setApplicantName(rec.getApplicantName());
             d.setApplicantMobile(rec.getContactMobile());
@@ -537,6 +538,73 @@ public class LingShanAgentServiceServiceImpl implements LingShanAgentServiceServ
         }).collect(Collectors.toList());
     }
 
+    @Override
+    public LingShanScreenServiceRstDTO screenServiceDetail(String id) {
+        LingshanAgentServiceRecordEntity serviceRecord = agentServiceRecordDao.selectById(id);
+        if (serviceRecord == null) {
+            throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "未找到对应服务，ID:" + id);
+        }
+
+        LingShanScreenServiceRstDTO rd = new LingShanScreenServiceRstDTO();
+        rd.setExceptServeAddress(serviceRecord.getExceptServeAddress());
+        rd.setExceptServeTime(serviceRecord.getExceptServeTime());
+        rd.setContent(serviceRecord.getContent());
+        rd.setLatitude(serviceRecord.getLatitude());
+        rd.setLongitude(serviceRecord.getLongitude());
+        rd.setAgentMobile(serviceRecord.getContactMobile());
+        rd.setAgentName(serviceRecord.getAgentName());
+        rd.setApplicantMobile(serviceRecord.getContactMobile());
+        rd.setApplicantName(serviceRecord.getApplicantName());
+        rd.setCreatedTime(serviceRecord.getCreatedTime());
+        rd.setCloseTime(serviceRecord.getCloseTime());
+        rd.setSatisfication(serviceRecord.getSatisfication());
+        rd.setAttachments(JSON.parseArray(serviceRecord.getAttachments(), String.class));
+
+        // 处理进展
+        List<LingShanScreenServiceRstDTO.ProcessNode> processNodes = rd.getProcessNodes();
+
+        // 创建起始节点
+        LingShanScreenServiceRstDTO.ProcessNode nc = createProcessNode(LingShanAgentServiceProcessStatusEnum.WAIT_ACCEPT, serviceRecord.getApplicantName(), null, new ArrayList<>());
+        processNodes.add(nc);
+
+        // 根据最新状态拼接后续处理节点
+        int processStatus = serviceRecord.getProcessStatus().intValue();
+        LingShanAgentServiceProcessStatusEnum processStatusEnum = LingShanAgentServiceProcessStatusEnum.getByStatus(processStatus);
+
+        if (LingShanAgentServiceProcessStatusEnum.WITHDRAW.getStatusCode() == processStatus) {
+            // 已撤回
+            LingShanScreenServiceRstDTO.ProcessNode nd = createProcessNode(processStatusEnum, serviceRecord.getApplicantName(), null, new ArrayList<>());
+            processNodes.add(nd);
+        } else {
+            // 正常处理流程
+            if (processStatus == LingShanAgentServiceProcessStatusEnum.ACCEPTED.getStatusCode()) {
+                // 受理 0 1
+                LingShanScreenServiceRstDTO.ProcessNode np = createProcessNode(processStatusEnum, serviceRecord.getAgentName(), serviceRecord.getProcessDesc(), new ArrayList<>());
+                processNodes.add(np);
+            } else if (processStatus == LingShanAgentServiceProcessStatusEnum.REJECTED.getStatusCode()) {
+                // 驳回 0 2
+                LingShanScreenServiceRstDTO.ProcessNode np = createProcessNode(processStatusEnum, serviceRecord.getAgentName(), serviceRecord.getProcessDesc(), new ArrayList<>());
+                processNodes.add(np);
+            } else {
+                // 办结 0 1 3
+                LingShanScreenServiceRstDTO.ProcessNode na = createProcessNode(LingShanAgentServiceProcessStatusEnum.ACCEPTED, serviceRecord.getAgentName(), serviceRecord.getProcessDesc(), new ArrayList<>());
+                LingShanScreenServiceRstDTO.ProcessNode ncc = createProcessNode(LingShanAgentServiceProcessStatusEnum.CLOSED, serviceRecord.getAgentName(), serviceRecord.getCloseDesc(), JSON.parseArray(serviceRecord.getProcessAttachments(), String.class));
+                processNodes.add(na);
+                processNodes.add(ncc);
+            }
+
+        }
+
+        return rd;
+    }
+
+    private LingShanScreenServiceRstDTO.ProcessNode createProcessNode(LingShanAgentServiceProcessStatusEnum processStatusEnum, String applicantName, String processDesc, List<String> processAttachments) {
+        return new LingShanScreenServiceRstDTO.ProcessNode(
+                processStatusEnum.getStatusCode(),
+                processStatusEnum.getStatusName(),
+                applicantName, processDesc, processAttachments);
+    }
+
     @Override
     public List<ScreenAgentServiceCategoryAnalysisRstDTO> serviceCategoryAnalysis(String orgType, String orgId) {
 

epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/IcHouseListResultDTO.java

@@ -94,4 +94,8 @@ public class IcHouseListResultDTO implements Serializable {
     private String floor;
 
 
+    /**
+     * 灵山项目：是否党员中心户：1是；0不是
+     */
+    private String partyCenterHouseFlag;
 }

epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcHouseDao.xml

@@ -130,7 +130,8 @@
         gr.GRID_NAME,
         IFNULL(a.sort,0) as sort,
         IFNULL(a.REMARK,'') AS remark,
-        a.CUSTOMER_ID
+        a.CUSTOMER_ID,
+        a.PARTY_CENTER_HOUSE_FLAG as partyCenterHouseFlag
         from ic_house a
         LEFT JOIN ic_building b on a.BUILDING_ID = b.ID and b.DEL_FLAG = '0'
         LEFT JOIN ic_neighbor_hood c on a.NEIGHBOR_HOOD_ID = c.ID and c.DEL_FLAG = '0'