From 4a8ff39b0fab0627ef8f7459587d514cc01c3676 Mon Sep 17 00:00:00 2001
From: rk <94314517@qq.com>
Date: 星期一, 20 十月 2025 10:52:02 +0800
Subject: [PATCH] Merge branch 'wuhuyancao' of http://139.186.142.91:10010/r/productDev/dmvisit into wuhuyancao
---
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/JkSketchServiceImpl.java | 30 ++++++++++++++++++++++--------
1 files changed, 22 insertions(+), 8 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 437120d..729c962 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
@@ -76,7 +76,6 @@
jkSketchMapper.insert(jkSketch);
return jkSketch.getId();
}
-
@Override
public void deleteById(Integer id) {
jkSketchMapper.deleteById(id);
@@ -87,7 +86,6 @@
UpdateWrapper<JkSketch> deleteWrapper = new UpdateWrapper<>(jkSketch);
jkSketchMapper.delete(deleteWrapper);
}
-
@Override
@PostConstruct
@@ -181,6 +179,7 @@
.selectAs(JkLine::getMaxCustomer,JkSketchLine::getMaxCustomer)
.leftJoin(JkLine.class,JkLine::getId,JkOrders::getLineId )
.eq(JkSketchLine::getSketchId,jkSketch.getId())
+ .eq(JkSketchLine::getType, Constants.formatIntegerNum(model.getOptStatus()))
.eq(JkSketchLine::getIsdeleted,Constants.ZERO));
if(lineList ==null ||lineList.size() ==0){
throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"褰撳墠绾胯矾涓嶆弧瓒充紭鍖栨柟妗堣皟鏁存潯浠讹紒");
@@ -241,7 +240,6 @@
}
checkJketchCustomerLocation(model,true);
model.setEditDate(new Date());
- model.setEditor(jkSketch.getLoginUserInfo().getId());
model.setDistance(model.getOriginDistance());
jkSketchMapper.updateById(model);
return model;
@@ -444,6 +442,11 @@
c.setCustomerList(customerList);
return c;
}
+
+ /**
+ * 寮�濮嬪紓姝ユ墽琛岀嚎璺紭鍖栦换鍔�
+ * @param model
+ */
@Override
@Async
public void startUpdateLineAsync(JkSketch model) {
@@ -492,7 +495,11 @@
.set(JkSketch::getStatus,Constants.THREE)
.set(JkSketch::getPlanLineEndDate,new Date()));
}
-
+ }
+ @Override
+ @Async
+ public void startInitOriginDistanceBatch( JkSketch model) {
+ initOriginDistance(model);
}
@Override
@Async
@@ -511,6 +518,7 @@
.selectAs(JkCustomer::getStartDistance,JkSketchCustomer::getStartDistance)
.selectAs(JkCustomer::getEndDistance,JkSketchCustomer::getEndDistance)
.leftJoin(JkCustomer.class,JkCustomer::getId,JkSketchCustomer::getCustomerId )
+ .eq(JkSketchCustomer::getType, Constants.equalsInteger(model.getOptStatus(),Constants.ONE)?1:0)
.eq(JkSketchCustomer::getSketchId, model.getId())
.eq(JkSketchCustomer::getIsdeleted,Constants.ZERO)
.orderByAsc(JkSketchCustomer::getSortnum);
@@ -550,7 +558,6 @@
for (int j = 0; j < customerListParam.size(); j++) {
distanceMatrix1[i+1][j+1] =disList.get(j+1).getDistance() ;
}
-
}
//鏋勯�犱紭鍖栨暟鎹ā鍨�
dataModel.initDataInfo(vehicleNumber1,demands1,vehicleCapacities1,distanceMatrix1);
@@ -574,7 +581,6 @@
}
line.setDistance(so.getDistance());
}
-
}catch (Exception e){
e.printStackTrace();
success =false;
@@ -595,9 +601,7 @@
.set(JkSketch::getStatus,success?Constants.TWO:Constants.THREE)
.set(JkSketch::getPlanLineEndDate,new Date()));
}
-
}
-
private List<JkSketchCustomer> initSketchCustomerListParam(List<JkSketchCustomer> customerList, List<JkSketchCustomer> customerList1) {
for(JkSketchCustomer param : customerList){
for(JkSketchCustomer model : customerList1){
@@ -761,6 +765,7 @@
tModel.setTotalNum(new BigDecimal(0));
tModel.setOrderNum(routes.size()-2);
tModel.setDateInfo(model.getDateInfo());
+ tModel.setType(Constants.ONE);
tModel.setSortnum(sketchLineList.size()+1);
tModel.setEditDate(tModel.getCreateDate());
tModel.setEditor(tModel.getCreator());
@@ -779,6 +784,7 @@
cModel.setCreator(tModel.getCreator());
cModel.setOrderId(customer.getOrderId());
cModel.setCreateDate(tModel.getCreateDate());
+ cModel.setType(Constants.ONE);
cModel.setTotalNum(customer.getTotalNum());
cModel.setDateInfo(model.getDateInfo());
cModel.setSortnum(tModel.getCustomerList().size()+1);
@@ -796,10 +802,12 @@
jkSketchLineMapper.update(null,new UpdateWrapper<JkSketchLine>().lambda()
.set(JkSketchLine::getIsdeleted,Constants.ONE)
.eq(JkSketchLine::getIsdeleted,Constants.ZERO)
+ .eq(JkSketchLine::getType,Constants.ONE)
.eq(JkSketchLine::getDateInfo,model.getDateInfo()));
jkSketchCustomerMapper.update(null,new UpdateWrapper<JkSketchCustomer>().lambda()
.set(JkSketchCustomer::getIsdeleted,Constants.ONE)
.eq(JkSketchCustomer::getIsdeleted,Constants.ZERO)
+ .eq(JkSketchCustomer::getType,Constants.ONE)
.eq(JkSketchCustomer::getDateInfo,model.getDateInfo()));
if(sketchLineList.size()>0){
jkSketchLineMapper.insert(sketchLineList);
@@ -819,6 +827,7 @@
.eq(JkSketch::getId,model.getId() )
.eq(JkSketch::getJobId,model.getJobId() )
.set(JkSketch::getLineNum,sketchLineList.size() )
+ .set(JkSketch::getOptStatus,Constants.ONE)//宸茬敓鎴愪紭鍖栫嚎璺�
.set(JkSketch::getDistance,totalDistance)
.set(JkSketch::getPlanLineInfo,"鏈�杩戜竴娆＄嚎璺紭鍖栨垚鍔燂紝浼樺寲鍚庢�昏窛绂伙細"+(totalDistance/1000)+"鍏噷锛�")
.set(JkSketch::getStatus,Constants.TWO)
@@ -845,6 +854,7 @@
.selectAs(JkCustomer::getStartDistance,JkSketchCustomer::getStartDistance)
.selectAs(JkCustomer::getEndDistance,JkSketchCustomer::getEndDistance)
.leftJoin(JkCustomer.class,JkCustomer::getId,JkSketchCustomer::getCustomerId )
+ .eq(JkSketchCustomer::getType, Constants.formatIntegerNum(model.getOptStatus()))
.eq(JkSketchCustomer::getSketchId, model.getId())
.eq(JkSketchCustomer::getIsdeleted,Constants.ZERO)
.orderByAsc(JkSketchCustomer::getSortnum);
@@ -873,6 +883,7 @@
queryWrapper1.selectAll(JkSketchLine.class )
.eq(JkSketchLine::getSketchId, model.getId())
.eq(JkSketchLine::getIsdeleted,Constants.ZERO)
+ .eq(JkSketchLine::getType, Constants.formatIntegerNum(model.getOptStatus()))
.orderByAsc(JkSketchLine::getSortnum);
List<JkSketchLine> lineList = jkSketchLineMapper.selectJoinList(JkSketchLine.class,queryWrapper1);
initCustomerDistance(lineList,model,updateLineDistance);
@@ -1086,6 +1097,7 @@
tModel.setTotalNum(orders.getNum());
tModel.setDateInfo(orders.getDateInfo());
tModel.setSortnum(list.size()+1);
+ tModel.setType(Constants.ZERO);
tModel.setEditDate(tModel.getCreateDate());
tModel.setEditor(tModel.getCreator());
tModel.setIsdeleted(Constants.ZERO);
@@ -1108,6 +1120,7 @@
initOrderAndTotalNum(tModel,line.getId(),newOrderList);
tModel.setDateInfo(newList.get(0).getDateInfo());
tModel.setSortnum(list.size()+1);
+ tModel.setType(Constants.ZERO);
tModel.setEditDate(tModel.getCreateDate());
tModel.setEditor(tModel.getCreator());
tModel.setIsdeleted(Constants.ZERO);
@@ -1163,6 +1176,7 @@
tModel.setCreateDate(orders.getCreateDate());
tModel.setCategoryId(orders.getCategoryId());
tModel.setTotalNum(orders.getNum());
+ tModel.setOptStatus(Constants.ZERO);
tModel.setOrderNum(1);
tModel.setDateInfo(orders.getDateInfo());
tModel.setSortnum(list.size()+1);
--
Gitblit v1.9.3