|
@@ -43,8 +43,6 @@ public class TruckEscortServiceImpl extends ServiceImpl<TruckEscortMapper, Truck
|
|
|
TruckEscortMapper truckEscortMapper;
|
|
TruckEscortMapper truckEscortMapper;
|
|
|
@Resource
|
|
@Resource
|
|
|
private CommonService commonService;
|
|
private CommonService commonService;
|
|
|
- @Resource
|
|
|
|
|
- private TruckDriverService truckDriverService;
|
|
|
|
|
|
|
|
|
|
@Override
|
|
@Override
|
|
|
public IPage<TruckEscort> findPage(PageParam<TruckEscortListParam> pageParam) {
|
|
public IPage<TruckEscort> findPage(PageParam<TruckEscortListParam> pageParam) {
|
|
@@ -127,18 +125,6 @@ public class TruckEscortServiceImpl extends ServiceImpl<TruckEscortMapper, Truck
|
|
|
truckEscort.setTruckId(param.getTruckId());
|
|
truckEscort.setTruckId(param.getTruckId());
|
|
|
}
|
|
}
|
|
|
flag = saveOrUpdate(truckEscort);
|
|
flag = saveOrUpdate(truckEscort);
|
|
|
- //添加truck_driver
|
|
|
|
|
- TruckDriver truckDriver = new TruckDriver();
|
|
|
|
|
- truckDriver.setTruckId(param.getTruckId());
|
|
|
|
|
- truckDriver.setOrgId(param.getOrgId());
|
|
|
|
|
- truckDriver.setCreateDate(LocalDateTime.now());
|
|
|
|
|
- truckDriver.setCreater(param.getCreater());
|
|
|
|
|
- truckDriver.setCreaterName(param.getCreaterName());
|
|
|
|
|
- truckDriver.setDriverId(userSave.getUserId());
|
|
|
|
|
- truckDriver.setDriverName(userSave.getUserName());
|
|
|
|
|
- boolean saveTruckDriver = truckDriverService.save(truckDriver);
|
|
|
|
|
- log.info("添加押运员,保存truckDriver,参数:{},结果:{}", JSON.toJSONString(truckDriver), saveTruckDriver);
|
|
|
|
|
-
|
|
|
|
|
}
|
|
}
|
|
|
return flag;
|
|
return flag;
|
|
|
}
|
|
}
|
|
@@ -183,25 +169,6 @@ public class TruckEscortServiceImpl extends ServiceImpl<TruckEscortMapper, Truck
|
|
|
}
|
|
}
|
|
|
commonService.updateUser(user);
|
|
commonService.updateUser(user);
|
|
|
|
|
|
|
|
- //删除truck_driver
|
|
|
|
|
- boolean deleteFlag = truckDriverService.delete(param.getEscortId());
|
|
|
|
|
- if (param.getTruckId() != null) {
|
|
|
|
|
- log.info("新增押运员,删除truckDriver,参数:{},结果:{}", JSON.toJSONString(param.getEscortId()), deleteFlag);
|
|
|
|
|
- TruckDriver truckDriver = new TruckDriver();
|
|
|
|
|
- truckDriver.setOrgId(param.getOrgId());
|
|
|
|
|
- truckDriver.setTruckId(param.getTruckId());
|
|
|
|
|
- truckDriver.setCreateDate(LocalDateTime.now());
|
|
|
|
|
- truckDriver.setCreater(param.getCreater());
|
|
|
|
|
- truckDriver.setCreaterName(param.getCreaterName());
|
|
|
|
|
- truckDriver.setDriverId(param.getEscortId());
|
|
|
|
|
- truckDriver.setDriverName(user.getUserName());
|
|
|
|
|
- boolean saveTruckDriver = truckDriverService.save(truckDriver);
|
|
|
|
|
- log.info("新增押运员,新增truckDriver,参数:{},结果:{}", JSON.toJSONString(truckDriver), saveTruckDriver);
|
|
|
|
|
- }
|
|
|
|
|
- if (param.getTruckId() == null) {
|
|
|
|
|
- param.setTruckId(null);
|
|
|
|
|
- }
|
|
|
|
|
-
|
|
|
|
|
LambdaUpdateWrapper<TruckEscort> updateWrapper = new LambdaUpdateWrapper<>();
|
|
LambdaUpdateWrapper<TruckEscort> updateWrapper = new LambdaUpdateWrapper<>();
|
|
|
updateWrapper.eq(TruckEscort::getEscortId, param.getEscortId());
|
|
updateWrapper.eq(TruckEscort::getEscortId, param.getEscortId());
|
|
|
if (param.getTruckId() == null) {
|
|
if (param.getTruckId() == null) {
|