From 73c04875b9bddb012e28820c860d4e1a894b2040 Mon Sep 17 00:00:00 2001 From: wxz Date: Wed, 17 May 2023 09:55:36 +0800 Subject: [PATCH] =?UTF-8?q?fix:=E3=80=90=E7=81=B5=E5=B1=B1-=E7=BA=A2?= =?UTF-8?q?=E8=89=B2=E5=BE=85=E5=8A=9E=E3=80=91=E5=B1=85=E6=B0=91=E7=AB=AF?= =?UTF-8?q?=E6=8F=90=E4=BA=A4=EF=BC=8C=E7=BC=BA=E5=B0=91=E7=BB=8F=E7=BA=AC?= =?UTF-8?q?=E5=BA=A6=E5=AD=97=E6=AE=B5=E4=BF=9D=E5=AD=98=20fix:=E3=80=90?= =?UTF-8?q?=E7=81=B5=E5=B1=B1-=E7=BA=A2=E8=89=B2=E5=BE=85=E5=8A=9E?= =?UTF-8?q?=E3=80=91=E5=A4=A7=E5=B1=8F=E4=B8=AD=E5=A4=AE=EF=BC=8C=E4=BB=A3?= =?UTF-8?q?=E5=8A=9E=E5=91=98=EF=BC=8C=E6=9C=8D=E5=8A=A1=E7=9A=84=E6=95=B0?= =?UTF-8?q?=E9=87=8F=E6=9F=A5=E8=AF=A2=E9=94=99=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dto/form/lingshan/AgentServiceResiSubmitFormDTO.java | 4 ++++ .../epmet/service/impl/LingShanAgentServiceServiceImpl.java | 4 ++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/lingshan/AgentServiceResiSubmitFormDTO.java b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/lingshan/AgentServiceResiSubmitFormDTO.java index f4f914c07d..bff46b6ac1 100644 --- a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/lingshan/AgentServiceResiSubmitFormDTO.java +++ b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/lingshan/AgentServiceResiSubmitFormDTO.java @@ -32,4 +32,8 @@ public class AgentServiceResiSubmitFormDTO { @NotNull(message = "预约服务时间不能为空", groups = { Create.class }) private Date exceptServeTime; private List attachmentsList; + + private String longitude; + + private String latitude; } 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 bb9c85c2d7..ae8510d524 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 @@ -409,7 +409,7 @@ public class LingShanAgentServiceServiceImpl implements LingShanAgentServiceServ // 未办结事件 q.eq(LingshanAgentServiceRecordEntity::getCustomerId, EpmetRequestHolder.getLoginUserCustomerId()); q.likeRight(LingshanAgentServiceRecordEntity::getOrgIdPath, orgIdPath); - q.eq(LingshanAgentServiceRecordEntity::getProcessStatus, LingShanAgentServiceProcessStatusEnum.ACCEPTED); //已受理=未办结 + q.eq(LingshanAgentServiceRecordEntity::getProcessStatus, LingShanAgentServiceProcessStatusEnum.ACCEPTED.getStatusCode()); //已受理=未办结 rl.add(new ScreenCatalogueQtyStatsRstDTO("service_unclosed", "未办结事件", agentServiceRecordDao.selectCount(q))); @@ -417,7 +417,7 @@ public class LingShanAgentServiceServiceImpl implements LingShanAgentServiceServ q.clear(); q.eq(LingshanAgentServiceRecordEntity::getCustomerId, EpmetRequestHolder.getLoginUserCustomerId()); q.likeRight(LingshanAgentServiceRecordEntity::getOrgIdPath, orgIdPath); - q.eq(LingshanAgentServiceRecordEntity::getProcessStatus, LingShanAgentServiceProcessStatusEnum.CLOSED); //已受理=未办结 + q.eq(LingshanAgentServiceRecordEntity::getProcessStatus, LingShanAgentServiceProcessStatusEnum.CLOSED.getStatusCode()); //已受理=未办结 rl.add(new ScreenCatalogueQtyStatsRstDTO("service_closed", "已办结事件", agentServiceRecordDao.selectCount(q)));