From 5eb2c5d2396f1a3764dcc029185f139a427ba18f Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期一, 31 三月 2025 08:28:43 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/VisitsServiceImpl.java | 9 +++++----
1 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/VisitsServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/VisitsServiceImpl.java
index bb5e871..9d58b27 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/VisitsServiceImpl.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/VisitsServiceImpl.java
@@ -1617,7 +1617,7 @@
}
if(Constants.equalsInteger(visits.getStatus(),Constants.VisitStatus.pass)
&& Constants.equalsInteger(visits.getHkStatus(),Constants.ONE)
- &&StringUtils.isNotBlank(visits.getHkId())){
+ &&StringUtils.isNotBlank(visits.getCarNos())){
//鍙栨秷鍋滆溅鍦洪绾�
List<VisitPark> visitParkList = visitParkMapper.selectList(new QueryWrapper<VisitPark>().lambda()
.eq(VisitPark::getCarCode,visits.getCarNos())
@@ -1653,9 +1653,9 @@
}
if(Constants.equalsInteger(visits.getStatus(),Constants.VisitStatus.xfSuccess)
&& Constants.equalsInteger(visits.getHkStatus(),Constants.ONE)
- &&StringUtils.isNotBlank(visits.getHkId())){
+ &&StringUtils.isNotBlank(visits.getHkRecordId())){
VisitAppointmentCancelRequest request = new VisitAppointmentCancelRequest();
- request.setAppointRecordIds(new String[]{visits.getHkId()});
+ request.setAppointRecordIds(new String[]{visits.getHkRecordId()});
BaseResponse response = HKService.iccmCancelAppointment(request);
if(response==null || !StringUtils.equals(response.getCode(), HKConstants.RESPONSE_SUCCEE) || response.getData()==null){
throw new BusinessException(ResponseStatus.SERVER_ERROR.getCode(),response.getMsg());
@@ -2037,7 +2037,8 @@
.eq(Visits::getId,s.getId()));
VisitsServiceImpl.dealCancelNoticesData(noticesJoinMapper,approveMapper,"绯荤粺鍙栨秷",s.getId(),
- s.getType(),Constants.equalsInteger(s.getType(),Constants.ZERO)?Constants.noticesObjectType.visit:Constants.noticesObjectType.visitReporting
+ s.getType(),
+ !Constants.equalsInteger(s.getType(),Constants.TWO)?Constants.noticesObjectType.visit:Constants.noticesObjectType.visitReporting
);
--
Gitblit v1.9.3