From 10998d67dcae8239b54692caf5404857b65305c9 Mon Sep 17 00:00:00 2001
From: doum <doum>
Date: 星期三, 17 十二月 2025 18:05:05 +0800
Subject: [PATCH] 最新版本541200007
---
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/JkSketchServiceImpl.java | 21 ++++++++++++---------
1 files changed, 12 insertions(+), 9 deletions(-)
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/JkSketchServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/JkSketchServiceImpl.java
index 03a5919..1b774b2 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/JkSketchServiceImpl.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/JkSketchServiceImpl.java
@@ -246,10 +246,13 @@
throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"璇ョ嚎璺凡琚紭鍖栵紝宸叉棤娉曡绠楀師濮嬭矾绾胯矾绋嬫暟");
}
checkJketchCustomerLocation(model,true);
- model.setEditDate(new Date());
- model.setDistance(model.getOriginDistance());
- jkSketchMapper.updateById(model);
- return model;
+ JkSketch update = new JkSketch();
+ update.setId(model.getId());
+ update.setEditDate(new Date());
+ update.setDistance(model.getOriginDistance());
+ update.setOriginDistance(model.getOriginDistance());
+ jkSketchMapper.updateById(update);
+ return update;
}
@Override
@@ -547,7 +550,7 @@
dataModel.initDataInfo(vehicleNumber1,demands1,demands2,vehicleCapacities1,distanceMatrix1,vehicleMaxNodes);
TspSolver.startSearch(dataModel);
JkSketch nowModel = jkSketchMapper.selectById(model.getId());
- if(StringUtils.equals(model.getJobId(), nowModel.getJobId())){
+ if(!StringUtils.equals(model.getJobId(), nowModel.getJobId())){
log.error( "浼樺寲缁撴灉宸插け鏁堬紝闈炴渶杩戜竴娆℃搷浣滐紒");
return;
}
@@ -641,7 +644,7 @@
queryWrapper.selectAll(JkSketchCustomer.class )
.selectAs(JkCustomer::getName,JkSketchCustomer::getName)
.selectAs(JkCustomer::getCode,JkSketchCustomer::getCode)
- .selectAs(JkCustomer::getDistance,JkSketchCustomer::getDistanceJson)
+// .selectAs(JkCustomer::getDistance,JkSketchCustomer::getDistanceJson)
.selectAs(JkCustomer::getLongitude,JkSketchCustomer::getLongitude)
.selectAs(JkCustomer::getLatitude,JkSketchCustomer::getLatitude)
.selectAs(JkCustomer::getStartDistance,JkSketchCustomer::getStartDistance)
@@ -705,7 +708,7 @@
throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"绾胯矾銆�"+line.getLineName()+"銆戣皟鏁村け璐� 锛屾湭鑾峰緱鏈�浼樹氦閫氳鍒掓柟妗堬紒");
}
JkSketch nowModel = jkSketchMapper.selectById(model.getId());
- if(StringUtils.equals(model.getJobId(), nowModel.getJobId())){
+ if(!StringUtils.equals(model.getJobId(), nowModel.getJobId())){
throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"绾胯矾銆�"+line.getLineName()+"銆戣皟鏁村け璐� 锛岄潪鏈�杩戜竴娆℃搷浣滐紒");
}
@@ -766,7 +769,7 @@
queryWrapper.selectAll(JkSketchCustomer.class )
.selectAs(JkCustomer::getName,JkSketchCustomer::getName)
.selectAs(JkCustomer::getCode,JkSketchCustomer::getCode)
- .selectAs(JkCustomer::getDistance,JkSketchCustomer::getDistanceJson)
+// .selectAs(JkCustomer::getDistance,JkSketchCustomer::getDistanceJson)
.selectAs(JkCustomer::getLongitude,JkSketchCustomer::getLongitude)
.selectAs(JkCustomer::getLatitude,JkSketchCustomer::getLatitude)
.selectAs(JkCustomer::getStartDistance,JkSketchCustomer::getStartDistance)
@@ -1252,7 +1255,7 @@
.selectAs(JkCustomer::getName,JkSketchCustomer::getName)
.selectAs(JkCustomer::getCode,JkSketchCustomer::getCode)
.selectAs(JkCustomer::getDistanceStatus,JkSketchCustomer::getDistanceStatus)
- .selectAs(JkCustomer::getDistance,JkSketchCustomer::getDistanceJson)
+// .selectAs(JkCustomer::getDistance,JkSketchCustomer::getDistanceJson)
.selectAs(JkCustomer::getLongitude,JkSketchCustomer::getLongitude)
.selectAs(JkCustomer::getLatitude,JkSketchCustomer::getLatitude)
.selectAs(JkCustomer::getStartDistance,JkSketchCustomer::getStartDistance)
--
Gitblit v1.9.3