From 056678d6408e8fa5990f98e16cc13df2fc0afab8 Mon Sep 17 00:00:00 2001
From: lishiwei <3230787218@qq.com>
Date: Wed, 29 Apr 2026 18:16:05 +0800
Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E8=BD=A6=E8=BE=86=E7=94=B3=E8=AF=B7?=
=?UTF-8?q?=E5=88=86=E9=A1=B5=E5=88=97=E8=A1=A8=E5=A2=9E=E5=8A=A0=E9=9D=9E?=
=?UTF-8?q?=E9=A9=B3=E5=9B=9E=E6=9D=A1=E4=BB=B6=202=E3=80=81=E9=83=A8?=
=?UTF-8?q?=E9=97=A8=E8=BD=A6=E8=BE=86=E5=BD=95=E5=85=A5=E5=AD=97=E6=AE=B5?=
=?UTF-8?q?=E8=A1=A5=E5=85=85=203=E3=80=81=E7=A7=BB=E9=99=A4=E9=BB=91?=
=?UTF-8?q?=E5=90=8D=E5=8D=95=E8=A1=A5=E5=85=85=E5=90=8D=E7=A7=B0&?=
=?UTF-8?q?=E8=BF=9D=E8=A7=84=E7=8A=B6=E6=80=81=E8=A1=A5=E5=85=85=204?=
=?UTF-8?q?=E3=80=81=E8=BD=A6=E7=89=8C=E5=8F=B7=E5=94=AF=E4=B8=80=E6=80=A7?=
=?UTF-8?q?=E6=A0=A1=E9=AA=8C=E5=A2=9E=E5=8A=A0=E9=9D=9E=E9=A9=B3=E5=9B=9E?=
=?UTF-8?q?=E6=9D=A1=E4=BB=B6=205=E3=80=81=E5=AE=A1=E6=89=B9&=E7=94=B3?=
=?UTF-8?q?=E8=AF=B7=E8=AE=B0=E5=BD=95=E6=8C=89=E6=97=B6=E9=97=B4=E5=80=92?=
=?UTF-8?q?=E6=8E=92?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../primeport/command/VehicleViolationsAddExe.java | 1 +
.../primeport/service/VehicleApplyServiceImpl.java | 1 +
.../zcloud/primeport/dto/VehicleApplyInspectAddCmd.java | 9 ++++++++-
.../src/main/resources/mapper/VehicleApplyDO.xml | 1 +
.../src/main/resources/mapper/VehicleBlackDO.xml | 2 +-
.../src/main/resources/mapper/XgfApplyPersonDO.xml | 5 ++++-
6 files changed, 16 insertions(+), 3 deletions(-)
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 @@