diff --git a/web-app/src/main/java/com/zcloud/primeport/command/VehicleViolationsAddExe.java b/web-app/src/main/java/com/zcloud/primeport/command/VehicleViolationsAddExe.java index 61eab67..aa292b6 100644 --- a/web-app/src/main/java/com/zcloud/primeport/command/VehicleViolationsAddExe.java +++ b/web-app/src/main/java/com/zcloud/primeport/command/VehicleViolationsAddExe.java @@ -48,6 +48,7 @@ public class VehicleViolationsAddExe { } VehicleViolationsE examTypeE = new VehicleViolationsE(); + examTypeE.setViolationProcessingStatus(2); BeanUtils.copyProperties(cmd, examTypeE); boolean res = false; try { diff --git a/web-app/src/main/java/com/zcloud/primeport/service/VehicleApplyServiceImpl.java b/web-app/src/main/java/com/zcloud/primeport/service/VehicleApplyServiceImpl.java index 696ce21..0644b28 100644 --- a/web-app/src/main/java/com/zcloud/primeport/service/VehicleApplyServiceImpl.java +++ b/web-app/src/main/java/com/zcloud/primeport/service/VehicleApplyServiceImpl.java @@ -82,6 +82,7 @@ public class VehicleApplyServiceImpl implements VehicleApplyServiceI { queryWrapper.eq("licence_no", licenceNo); queryWrapper.in("vehicle_belong_type", 1,2,3,4,8,9); queryWrapper.eq("delete_enum", "false"); + queryWrapper.ne("audit_flag", 3); if (id != null) { queryWrapper.ne("id", id); } diff --git a/web-client/src/main/java/com/zcloud/primeport/dto/VehicleApplyInspectAddCmd.java b/web-client/src/main/java/com/zcloud/primeport/dto/VehicleApplyInspectAddCmd.java index 18b9a89..2cbfea6 100644 --- a/web-client/src/main/java/com/zcloud/primeport/dto/VehicleApplyInspectAddCmd.java +++ b/web-client/src/main/java/com/zcloud/primeport/dto/VehicleApplyInspectAddCmd.java @@ -23,8 +23,11 @@ import java.util.List; @AllArgsConstructor public class VehicleApplyInspectAddCmd extends Command { @ApiModelProperty(value = "名称", name = "remarks") - @NotEmpty(message = "名称") +// @NotEmpty(message = "名称") private String remarks; + @ApiModelProperty(value = "检查部门名称", name = "checkDepartmentName") + @NotEmpty(message = "检查部门名称") + private String checkDepartmentName; @ApiModelProperty(value = "车辆所属类型 1-股份员工车辆,2-股份单位车辆,3-分公司员工车辆,4-分公司单位车辆 ,5-相关方车辆, 6:临时车辆,7检查部门车辆", name = "vehicleBelongType", required = true) @NotEmpty(message = "车辆所属类型 1-股份员工车辆,2-股份单位车辆,3-分公司员工车辆,4-分公司单位车辆 ,5-相关方车辆, 6:临时车辆,7检查部门车辆不能为空") private String vehicleBelongType; @@ -45,6 +48,10 @@ public class VehicleApplyInspectAddCmd extends Command { private String vehicleTypeName; @ApiModelProperty(value = "车牌号", name = "licenceNo", required = true) private String licenceNo; + @ApiModelProperty(value = "访问开始时间", name = "visitStartTime", required = true) + private String visitStartTime; + @ApiModelProperty(value = "访问结束时间", name = "visitEndTime", required = true) + private String visitEndTime; } } diff --git a/web-infrastructure/src/main/resources/mapper/VehicleApplyDO.xml b/web-infrastructure/src/main/resources/mapper/VehicleApplyDO.xml index 8cecdab..7f563c9 100644 --- a/web-infrastructure/src/main/resources/mapper/VehicleApplyDO.xml +++ b/web-infrastructure/src/main/resources/mapper/VehicleApplyDO.xml @@ -48,6 +48,7 @@ LEFT JOIN vehicle_audit AS a ON f.id = a.vehicle_apply_id AND a.delete_enum = 'FALSE' AND a.audit_status = 1 WHERE f.delete_enum = 'FALSE' + AND f.audit_flag != 3 AND f.remarks like CONCAT('%', #{params.remarks}, '%') diff --git a/web-infrastructure/src/main/resources/mapper/VehicleBlackDO.xml b/web-infrastructure/src/main/resources/mapper/VehicleBlackDO.xml index 51dbb15..4ec613a 100644 --- a/web-infrastructure/src/main/resources/mapper/VehicleBlackDO.xml +++ b/web-infrastructure/src/main/resources/mapper/VehicleBlackDO.xml @@ -6,7 +6,7 @@