diff --git a/web-app/src/main/java/com/zcloud/primeport/command/VehicleMessageUpdateExe.java b/web-app/src/main/java/com/zcloud/primeport/command/VehicleMessageUpdateExe.java index cbb7fb2..36fd500 100644 --- a/web-app/src/main/java/com/zcloud/primeport/command/VehicleMessageUpdateExe.java +++ b/web-app/src/main/java/com/zcloud/primeport/command/VehicleMessageUpdateExe.java @@ -44,14 +44,15 @@ public class VehicleMessageUpdateExe { public void executeFormCorp(VehicleMessageUpdateCmd vehicleMessageUpdateCmd) { VehicleMessageE vehicleMessageE = new VehicleMessageE(); BeanUtils.copyProperties(vehicleMessageUpdateCmd, vehicleMessageE); - vehicleMessageE.updateFromCorp(vehicleMessageE); //车辆状态变成不通过 - VehicleMessageE infoById = vehicleMessageGateway.getInfoById(vehicleMessageUpdateCmd.getId()); - if (infoById == null){ - throw new BizException("车辆信息不存在"); - } - if (infoById.getIsAudit() != 2){ - throw new BizException("车辆信息正在审核"); - } + vehicleMessageE.updateFromCorp(vehicleMessageE); //修改车辆时候,初始化车辆信息 + +// VehicleMessageE infoById = vehicleMessageGateway.getInfoById(vehicleMessageUpdateCmd.getId()); +// if (infoById == null){ +// throw new BizException("车辆信息不存在"); +// } +// if (infoById.getIsAudit() != 2){ +// throw new BizException("车辆信息正在审核"); +// } boolean res = vehicleMessageGateway.update(vehicleMessageE); //修改车辆信息 if (!Tools.isEmpty(vehicleMessageUpdateCmd.getApprovalUserId())){ //新增一个审批记录 VehicleAuditLogE vehicleAuditLogE = new VehicleAuditLogE(); @@ -76,6 +77,10 @@ public class VehicleMessageUpdateExe { if (licenceNo > 0){ throw new BizException("车辆已存在"); } + val countByUserId = vehicleMessageGateway.countByUserId(vehicleMessageE.getEmployeeVehicleUserId()); + if (countByUserId >= 2){ + throw new BizException("你已经添加两个车辆了.请先停用后在启用."); + } res = vehicleMessageGateway.update(vehicleMessageE); }else if (statusCmd.getIsStatus() == 1){ res = vehicleMessageGateway.update(vehicleMessageE); //如果是车辆停工,就直接修改车辆状态 @@ -86,5 +91,6 @@ public class VehicleMessageUpdateExe { throw new BizException("修改失败"); } } + }