Commit 6e56256d authored by hezhen's avatar hezhen

123

parent fa1c4392
...@@ -77,6 +77,9 @@ public class VehiclePublishReceiveBiz extends BaseBiz<VehiclePublishReceiveMappe ...@@ -77,6 +77,9 @@ public class VehiclePublishReceiveBiz extends BaseBiz<VehiclePublishReceiveMappe
@Autowired @Autowired
BranchCompanyBiz branchCompanyBiz; BranchCompanyBiz branchCompanyBiz;
@Autowired
VehicleManageApplyBiz vehicleManageApplyBiz;
@Transactional(rollbackFor = Exception.class) @Transactional(rollbackFor = Exception.class)
...@@ -595,21 +598,34 @@ public class VehiclePublishReceiveBiz extends BaseBiz<VehiclePublishReceiveMappe ...@@ -595,21 +598,34 @@ public class VehiclePublishReceiveBiz extends BaseBiz<VehiclePublishReceiveMappe
throw new BaseException("需求不存在--id==="+id, ResultCode.FAILED_CODE); throw new BaseException("需求不存在--id==="+id, ResultCode.FAILED_CODE);
Integer type = vehiclePublish.getType(); Integer type = vehiclePublish.getType();
Integer companyId; Integer companyId;
Integer verifyId;
if (type == 1){ if (type == 1){
companyId = receiveVo.getPublishCompanyId(); companyId = receiveVo.getPublishCompanyId();
verifyId = receiveVo.getReceiveCompanyId();
}else { }else {
companyId = receiveVo.getReceiveCompanyId(); companyId = receiveVo.getReceiveCompanyId();
verifyId = receiveVo.getPublishCompanyId();
} }
Vehicle vehicle = new Vehicle(); Vehicle vehicle = new Vehicle();
vehicle.setId(vehicleId); vehicle.setId(vehicleId);
Vehicle vehicle1 = vehicleBiz.selectById(vehicleId); /*Vehicle vehicle1 = vehicleBiz.selectById(vehicleId);
if (vehicle1.getSubordinateBranch().equals(vehicle1.getManageCompanyId())){ if (vehicle1.getSubordinateBranch().equals(vehicle1.getManageCompanyId())){
vehicle.setManageCompanyId(companyId); vehicle.setManageCompanyId(companyId);
} }*/
vehicle.setParkBranchCompanyId(companyId); vehicle.setParkBranchCompanyId(companyId);
vehicleBiz.updateSelectiveById(vehicle); vehicleBiz.updateSelectiveById(vehicle);
VehicleManageApply vehicleManageApply = new VehicleManageApply();
vehicleManageApply.setApplyId(companyId);
vehicleManageApply.setStatus(1);
vehicleManageApply.setVehicleId(vehicleId);
vehicleManageApplyBiz.applyManage(vehicleManageApply);
vehicleManageApply = new VehicleManageApply();
vehicleManageApply.setToApplyId(verifyId);
vehicleManageApply.setVerifyId(verifyId);
vehicleManageApply.setStatus(1);
vehicleManageApply.setVehicleId(vehicleId);
vehicleManageApplyBiz.setVerify(vehicleManageApply);
} }
} }
VehiclePublishReceiveDTO publishReceiveDTO = new VehiclePublishReceiveDTO(); VehiclePublishReceiveDTO publishReceiveDTO = new VehiclePublishReceiveDTO();
......
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