diff --git a/web-app/src/main/java/com/zcloud/primeport/command/VehicleAuditUpdateExe.java b/web-app/src/main/java/com/zcloud/primeport/command/VehicleAuditUpdateExe.java index 5bf714b..433e63e 100644 --- a/web-app/src/main/java/com/zcloud/primeport/command/VehicleAuditUpdateExe.java +++ b/web-app/src/main/java/com/zcloud/primeport/command/VehicleAuditUpdateExe.java @@ -4,6 +4,7 @@ import com.alibaba.cola.exception.BizException; import com.zcloud.gbscommon.todolistmq.TodoListEventPusherUtil; import com.zcloud.gbscommon.todolistmq.event.TodoListCompleteEvent; import com.zcloud.gbscommon.utils.DateUtil; +import com.zcloud.primeport.domain.enums.VehicleBelongTypeEnum; import com.zcloud.primeport.domain.gateway.VehicleApplyGateway; import com.zcloud.primeport.domain.gateway.VehicleAuditGateway; import com.zcloud.primeport.domain.model.VehicleApplyE; @@ -62,10 +63,14 @@ public class VehicleAuditUpdateExe { TodoListCompleteEvent todoListCompleteEvent = new TodoListCompleteEvent(); todoListCompleteEvent.setForeignSubsidiaryKey(vehicleAuditE.getId()); todoListEventPusherUtil.sendMessageCompleteEvent(todoListCompleteEvent); - if (vehicleApplyE.getMkmjPermission().equals(1)) { - // 审批通过 进行数据对接。 - VehicleApplyE byId = vehicleApplyGateway.getById(cmd.getVehicleApplyId()); - carDockUtil.executeInternalVehicle(byId); + // 审批通过 进行数据对接。 + if (cmd.getAuditStatus().equals(2)) { + VehicleApplyE vehicleApplyE1 = vehicleApplyGateway.getById(cmd.getVehicleApplyId()); + if (vehicleApplyE1.getVehicleBelongType().equals(VehicleBelongTypeEnum.TEMP_VEHICLES.getCode()) || vehicleApplyE1.getVehicleBelongType().equals(VehicleBelongTypeEnum.XGF_VEHICLES.getCode())) { + carDockUtil.execute(vehicleApplyE1.getLicenceNo()); + } else { + carDockUtil.executeInternalVehicle(vehicleApplyE1); + } } } diff --git a/web-domain/src/main/java/com/zcloud/primeport/domain/enums/VehicleBelongTypeEnum.java b/web-domain/src/main/java/com/zcloud/primeport/domain/enums/VehicleBelongTypeEnum.java index d0354b7..80cb994 100644 --- a/web-domain/src/main/java/com/zcloud/primeport/domain/enums/VehicleBelongTypeEnum.java +++ b/web-domain/src/main/java/com/zcloud/primeport/domain/enums/VehicleBelongTypeEnum.java @@ -7,10 +7,12 @@ public enum VehicleBelongTypeEnum { FGS_PUB_VEHICLES("4", "分公司单位车辆"), XGF_VEHICLES("5", "相关方车辆"), TEMP_VEHICLES("6", "临时车辆"), + ZGDW_PRI_VEHICLES("8", "驻港单位员工车辆"), + ZGDW_PUB_VEHICLES("9", "驻港单位公车"), CHECK_VEHICLES("7", "检查部门车辆"); private String code; private String desc; - + // 8,驻港单位员工车辆,9驻港单位公车 VehicleBelongTypeEnum(String code, String desc) { this.code = code; this.desc = desc;