Skip to content

C
cloud-platform
Commit dd1f5c04 authored by jiaorz's avatar jiaorz
Browse files
Options

Merge branch 'master-count-vehicle' into base-modify

parents e0892425 4e8f9ac6
Hide whitespace changes
Inline Side-by-side
Showing with 26 additions and 22 deletions
xx-vehicle/xx-vehicle-server/src/main/java/com/xxfc/platform/vehicle/biz/VehicleBiz.java
View file @ dd1f5c04
...@@ -292,30 +292,34 @@ public class VehicleBiz extends BaseBiz<VehicleMapper, Vehicle> implements UserR ...@@ -292,30 +292,34 @@ public class VehicleBiz extends BaseBiz<VehicleMapper, Vehicle> implements UserR
for (Vehicle exitsVehicle : exitsVehicles) { for (Vehicle exitsVehicle : exitsVehicles) {
if (exitsVehicle.getId().equals(addOrUpdateVehicleVo.getId())) { if (exitsVehicle.getId().equals(addOrUpdateVehicleVo.getId())) {
//如果修改的有停靠分公司，需要添加一条调度记录 //如果修改的有停靠分公司，需要添加一条调度记录
if (exitsVehicle.getParkBranchCompanyId() != addOrUpdateVehicleVo.getParkBranchCompanyId()) { Vehicle vehicle1 = selectById(exitsVehicle.getId());
VehicleBookRecord vehicleBookRecord = new VehicleBookRecord(); if (vehicle1 != null) {
vehicleBookRecord.setRetCompany(addOrUpdateVehicleVo.getParkBranchCompanyId()); if (vehicle1.getParkBranchCompanyId() != addOrUpdateVehicleVo.getParkBranchCompanyId()) {
vehicleBookRecord.setLiftCompany(exitsVehicle.getParkBranchCompanyId()); VehicleBookRecord vehicleBookRecord = new VehicleBookRecord();
vehicleBookRecord.setRemark("后台修改停靠公司，调度车辆"); vehicleBookRecord.setRetCompany(addOrUpdateVehicleVo.getParkBranchCompanyId());
vehicleBookRecord.setBookStartDate(new Date()); vehicleBookRecord.setLiftCompany(vehicle1.getParkBranchCompanyId());
vehicleBookRecord.setBookEndDate(new Date()); vehicleBookRecord.setRemark("后台修改停靠公司，调度车辆");
vehicleBookRecord.setActualEndDate(new Date()); vehicleBookRecord.setBookStartDate(new Date());
vehicleBookRecord.setActualStartDate(new Date()); vehicleBookRecord.setBookEndDate(new Date());
vehicleBookRecord.setBookUser(userDTO.getId()); vehicleBookRecord.setActualEndDate(new Date());
vehicleBookRecord.setBookUserName(userDTO.getUsername()); vehicleBookRecord.setActualStartDate(new Date());
vehicleBookRecord.setStatus(VehicleBookRecordStatus.APPROVE.getCode()); vehicleBookRecord.setBookUser(userDTO.getId());
vehicleBookRecord.setBookType(BookType.DISPATCH.getCode()); vehicleBookRecord.setBookUserName(userDTO.getUsername());
vehicleBookRecord.setVehicleId(exitsVehicle.getId()); vehicleBookRecord.setStatus(VehicleBookRecordStatus.APPROVE.getCode());
vehicleBookRecord.setVehicleUsername(userDTO.getUsername()); vehicleBookRecord.setBookType(BookType.DISPATCH.getCode());
vehicleBookRecord.setVehicleUserPhone(userDTO.getUsername()); vehicleBookRecord.setVehicleId(vehicle1.getId());
ObjectRestResponse objectRestResponse = addVehicleBookRecord(vehicleBookRecord); vehicleBookRecord.setVehicleUsername(userDTO.getUsername());
if(objectRestResponse.isRel()) { vehicleBookRecord.setVehicleUserPhone(userDTO.getUsername());
continue; ObjectRestResponse objectRestResponse = addVehicleBookRecord(vehicleBookRecord);
} else { if(objectRestResponse.isRel()) {
return RestResponse.codeAndMessage(objectRestResponse.getStatus(), objectRestResponse.getMessage()); continue;
} } else {
return RestResponse.codeAndMessage(objectRestResponse.getStatus(), objectRestResponse.getMessage());
}
}
} }
} }
return RestResponse.codeAndMessage(ResCode.VEHICLE_INFO_SAME_NUM_PLATE_EXISTS.getCode(), return RestResponse.codeAndMessage(ResCode.VEHICLE_INFO_SAME_NUM_PLATE_EXISTS.getCode(),
ResCode.VEHICLE_INFO_SAME_NUM_PLATE_EXISTS.getDesc()); ResCode.VEHICLE_INFO_SAME_NUM_PLATE_EXISTS.getDesc());
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment