From 995436f56f93874f19b8094fe5537e96d413b6fd Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期二, 30 七月 2024 18:07:49 +0800
Subject: [PATCH] 修复bug
---
server/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/fhk/HkSyncVehicleFromHKServiceImpl.java | 32 ++++++++++++++++++++++++++------
1 files changed, 26 insertions(+), 6 deletions(-)
diff --git a/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/fhk/HkSyncVehicleFromHKServiceImpl.java b/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/fhk/HkSyncVehicleFromHKServiceImpl.java
index 4f8ce59..4050407 100644
--- a/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/fhk/HkSyncVehicleFromHKServiceImpl.java
+++ b/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/fhk/HkSyncVehicleFromHKServiceImpl.java
@@ -21,6 +21,7 @@
import com.doumee.core.utils.DateUtil;
import com.doumee.core.utils.Utils;
import com.doumee.dao.business.*;
+import com.doumee.dao.business.model.CarEvent;
import com.doumee.dao.business.model.Cars;
import com.doumee.dao.business.model.Member;
import com.doumee.dao.business.model.Visits;
@@ -49,6 +50,8 @@
private MemberMapper memberMapper;
@Autowired
private ParksMapper parksMapper;
+ @Autowired
+ private CarEventMapper carEventMapper;
@Autowired
private CarsMapper carsMapper;
@Autowired
@@ -151,7 +154,6 @@
}
private void dealUpdateByList(List<VehicleTimeRangeInfoResponse> list) {
- List<Cars> newList = new ArrayList<>();
if(list == null || list.size()==0){
return ;
}
@@ -174,10 +176,21 @@
c.setEditDate(DateUtil.getISO8601DateByStr(model.getUpdateTime()));
if(StringUtils.isNotBlank(model.getPersonId())){
//琚闂汉
- Member member = memberMapper.selectOne(new QueryWrapper<Member>().lambda().eq(Member::getHkId,model.getPersonId()).last("limit 1"));
+ Member member = memberMapper.selectOne(new QueryWrapper<Member>().lambda()
+ .eq(Member::getHkId,model.getPersonId())
+ .last("limit 1"));
c.setMemberId(member!=null?member.getId():null);
+ if(member!=null){
+ carEventMapper.update(null,new UpdateWrapper<CarEvent>().lambda()
+ .set(CarEvent::getMemberId,member.getId())
+ .eq(CarEvent::getPlateNos,c.getCode())
+ .apply("(member_id is null or member_id='')")
+ );
+ }
}
- Cars cars = carsMapper.selectOne(new QueryWrapper<Cars>().lambda().eq(Cars::getHkId,model.getVehicleId()).last("limit 1"));
+ Cars cars = carsMapper.selectOne(new QueryWrapper<Cars>().lambda()
+ .eq(Cars::getHkId,model.getVehicleId())
+ .last("limit 1"));
if(cars!=null){
//鏇存柊
c.setId(cars.getId());
@@ -186,7 +199,6 @@
//鏂板
carsMapper.insert(c);
}
-
}
}
@@ -210,13 +222,21 @@
c.setEditDate(DateUtil.getISO8601DateByStr(model.getUpdateTime()));
if(StringUtils.isNotBlank(model.getPersonId())){
//琚闂汉
- Member member = memberMapper.selectOne(new QueryWrapper<Member>().lambda().eq(Member::getHkId,model.getPersonId()).last("limit 1"));
+ Member member = memberMapper.selectOne(new QueryWrapper<Member>().lambda()
+ .eq(Member::getHkId,model.getPersonId())
+ .last("limit 1"));
c.setMemberId(member!=null?member.getId():null);
+ if(member!=null){
+ carEventMapper.update(null,new UpdateWrapper<CarEvent>().lambda()
+ .set(CarEvent::getMemberId,member.getId())
+ .eq(CarEvent::getPlateNos,c.getCode())
+ .apply("(member_id is null or member_id='')")
+ );
+ }
}
newList.add(c);
}
return newList;
}
-
}
--
Gitblit v1.9.3