From 72bb63e0ba9c2f45a2c382f9444f283c3ac24f11 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Wed, 17 May 2023 16:44:14 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E6=88=BF=E5=B1=8B=E7=AE=A1=E7=90=86-?= =?UTF-8?q?=E6=88=BF=E5=B1=8B=E5=88=97=E8=A1=A8=E3=80=81=E6=9F=A5=E7=9C=8B?= =?UTF-8?q?=E8=AF=A6=E6=83=85=E3=80=81=E7=A4=BE=E5=8C=BA=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=EF=BC=88=E6=88=BF=E5=B1=8B=EF=BC=89=E7=BB=9F=E4=B8=80=E8=BF=94?= =?UTF-8?q?=E5=9B=9EpartyCenterHouseFlag?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/epmet/dto/result/IcHouseListResultDTO.java | 5 ++++- .../gov-org-server/src/main/resources/mapper/IcHouseDao.xml | 3 ++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/IcHouseListResultDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/IcHouseListResultDTO.java index 03346cb6fc..459fb1bcca 100644 --- a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/IcHouseListResultDTO.java +++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/IcHouseListResultDTO.java @@ -89,5 +89,8 @@ public class IcHouseListResultDTO implements Serializable { */ private String houseCode; - + /** + * 灵山项目：是否党员中心户：1是；0不是 + */ + private String partyCenterHouseFlag; } diff --git a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcHouseDao.xml b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcHouseDao.xml index fb4e43e0bf..7ffaff80a2 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcHouseDao.xml +++ b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcHouseDao.xml @@ -118,7 +118,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' From 79bf2c6ce18c43d57d2f5898531a895c4865e246 Mon Sep 17 00:00:00 2001 From: wxz Date: Wed, 17 May 2023 16:53:10 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E6=96=B0=E5=A2=9E=EF=BC=9A=E3=80=90?= =?UTF-8?q?=E7=81=B5=E5=B1=B1=E8=A1=97=E9=81=93=E3=80=91=E5=A4=A7=E5=B1=8F?= =?UTF-8?q?=EF=BC=8C=E4=BB=A3=E5=8A=9E=E6=9C=8D=E5=8A=A1=E8=AF=A6=E6=83=85?= =?UTF-8?q?=EF=BC=88=E5=A4=84=E7=90=86=E8=BF=9B=E5=B1=95=EF=BC=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../LingShanScreenServiceRstDTO.java | 32 ++++++++- .../LingShanAgentServiceController.java | 13 ++++ .../service/LingShanAgentServiceService.java | 2 + .../impl/LingShanAgentServiceServiceImpl.java | 70 ++++++++++++++++++- 4 files changed, 115 insertions(+), 2 deletions(-) diff --git a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/agentservice/LingShanScreenServiceRstDTO.java b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/agentservice/LingShanScreenServiceRstDTO.java index 4669c0a2ce..f9e9cf9db2 100644 --- a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/agentservice/LingShanScreenServiceRstDTO.java +++ b/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 attachments; + private String processStatus; + private String closeDesc; + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private Date closeTime; + private Integer satisfication; + + /** + * 处理进展 + */ + private List processNodes = new ArrayList<>(); + + @Data + @NoArgsConstructor + @AllArgsConstructor + public static class ProcessNode { + private Integer processType; + private String processTypeName; + private String processorName; + private String processDesc; + private List processAttachments = new ArrayList<>(); + } } 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 541462c10b..6bca986b45 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 @@ -286,6 +286,19 @@ public class LingShanAgentServiceController { return new Result>().ok(rl); } + /** + * @Description: 中央大屏:服务详情 + * @param id: + * @Return com.epmet.commons.tools.utils.Result + * @Author: wangxianzhang + * @Date: 2023/5/17 2:40 PM + */ + @GetMapping("screen/serviceDetail") + public Result screenServiceDetail(@RequestParam("id") String id) { + LingShanScreenServiceRstDTO c = lingShanServiceAgentService.screenServiceDetail(id); + return new Result().ok(c); + } + /** * @Description: 服务类型数量分析 * @param orgType: 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 992244d76b..539809106a 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 @@ -38,4 +38,6 @@ public interface LingShanAgentServiceService { List serviceCategoryAnalysis(String orgType, String orgId); List serviceTrendAnalysis(String orgType, String orgId); + + LingShanScreenServiceRstDTO screenServiceDetail(String id); } 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 cfa4aef5ee..0b2fc2bd19 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 @@ -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 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 processAttachments) { + return new LingShanScreenServiceRstDTO.ProcessNode( + processStatusEnum.getStatusCode(), + processStatusEnum.getStatusName(), + applicantName, processDesc, processAttachments); + } + @Override public List serviceCategoryAnalysis(String orgType, String orgId) {