From 6500da411f234b8ad0ee493909d515bf9eeecdd5 Mon Sep 17 00:00:00 2001
From: doum <doum>
Date: 星期四, 16 十月 2025 19:28:27 +0800
Subject: [PATCH] 最新版本541200007
---
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/JkCustomerServiceImpl.java | 26 ++++++++++++++++++++++----
1 files changed, 22 insertions(+), 4 deletions(-)
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/JkCustomerServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/JkCustomerServiceImpl.java
index acd94f9..5cb15bf 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/JkCustomerServiceImpl.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/JkCustomerServiceImpl.java
@@ -111,6 +111,12 @@
.set(JkCustomer::getLatitude,jkCustomer.getLatitude())
.set(JkCustomer::getLongitude,jkCustomer.getLongitude())
.set(JkCustomer::getEditor,jkCustomer.getLoginUserInfo().getId())
+ .set(JkCustomer::getStartDistance,null)
+ .set(JkCustomer::getEndDistance,null)
+ .set(JkCustomer::getStartSteps,null)
+ .set(JkCustomer::getEndSteps,null)
+ .set(JkCustomer::getDistanceStatus,Constants.ZERO)
+ .set(JkCustomer::getDistance,null)
.set(JkCustomer::getEditDate,new Date())
.eq(JkCustomer::getId,jkCustomer.getId())
);
@@ -237,10 +243,10 @@
try {
LambdaQueryWrapper<JkCustomer> queryWrapper = new LambdaQueryWrapper<>();
queryWrapper.isNotNull(JkCustomer::getLocation);
- queryWrapper.isNotNull(JkCustomer::getLocation);
queryWrapper.and(wrapper ->{
wrapper.isNull(JkCustomer::getLatitude)
- .or().isNull(JkCustomer::getLongitude); });
+ .or().isNull(JkCustomer::getLongitude)
+ .or().eq(JkCustomer::getDistanceStatus,Constants.TWO);});
//鏌ヨ鍏ㄩ儴鏈夊湴鍧�锛屼絾鏄病鏈夌粡绾害鐨勫鎴蜂俊鎭�
List<JkCustomer> list = jkCustomerMapper.selectList(queryWrapper);
if(list ==null || list.size()==0){
@@ -269,13 +275,18 @@
jkCustomerMapper.update(null,new UpdateWrapper<JkCustomer>().lambda()
.set(JkCustomer::getLatitude,c.getLatitude())
.set(JkCustomer::getLongitude,c.getLongitude())
+ .set(JkCustomer::getStartDistance,null)
+ .set(JkCustomer::getEndDistance,null)
+ .set(JkCustomer::getStartSteps,null)
+ .set(JkCustomer::getEndSteps,null)
+ .set(JkCustomer::getDistanceStatus,Constants.ZERO)
+ .set(JkCustomer::getDistance,null)
.set(JkCustomer::getEditDate,new Date())
.eq(JkCustomer::getId,c.getId())
);
}
}else{
- log.error("鏇存柊浜ゆ帶涓績瀹㈡埛缁忕含搴︿俊鎭�=====鑾峰彇json=========="+json);
- log.error("鏇存柊浜ゆ帶涓績瀹㈡埛缁忕含搴︿俊鎭�=====鑾峰彇澶辫触=========="+urlStr+c.getName()+"-"+c.getLocation());
+ log.error("鏇存柊浜ゆ帶涓績瀹㈡埛缁忕含搴︿俊鎭�=====鑾峰彇json=========="+urlStr+"\n"+c.getName()+"\n"+json);
}
}catch (Exception e){
log.error("鏇存柊浜ゆ帶涓績瀹㈡埛缁忕含搴︿俊鎭�=====澶辫触=========="+c.getName()+"-"+c.getLocation());
@@ -394,10 +405,17 @@
tModel.setCreator(loginUserInfo.getId());
tModel.setCreateDate(new Date());
tModel.setIsnew(Constants.ONE);
+ tModel.setDistanceStatus(Constants.TWO);//闇�瑕侀噸鏂板畾浣�
tModel.setStatus(Constants.ZERO);
tModel.setDistanceStatus(Constants.ZERO);
newList.add(tModel);
}else{
+ if(StringUtils.isBlank(model.getLocation()) ||
+ StringUtils.equals(tModel.getLocation().replaceAll("[^a-zA-Z0-9\\u4e00-\\u9fa5]","")
+ ,model.getLocation().replaceAll("[^a-zA-Z0-9\\u4e00-\\u9fa5]",""))){
+ //濡傛灉浣嶇疆淇℃伅鍙戠敓鍙樺寲
+ tModel.setDistanceStatus(Constants.TWO);//闇�瑕侀噸鏂板畾浣�
+ }
tModel.setIsnew(Constants.ZERO);
updateList.add(tModel);
}
--
Gitblit v1.9.3