Merge remote-tracking branch 'origin/lingshan_master' into lingshan_master

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<String> attachmentsList;
+
+    private String longitude;
+
+    private String latitude;
 }

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)));