From 2d753fc63bd2f4bf4514a6d909788bca8a1b1ad1 Mon Sep 17 00:00:00 2001 From: guoyuepeng <770272267@qq.com> Date: Fri, 21 Nov 2025 09:22:24 +0800 Subject: [PATCH] =?UTF-8?q?1.=E5=8F=A3=E9=97=A8=E9=97=A8=E7=A6=81-?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E8=BD=A6=E8=BE=86=E7=B1=BB=E5=9E=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/zcloud/primeport/dto/VehicleInspectionAddCmd.java | 3 +++ .../com/zcloud/primeport/dto/VehicleInspectionUpdateCmd.java | 3 +++ .../java/com/zcloud/primeport/dto/VehicleMessageAddCmd.java | 3 +++ .../com/zcloud/primeport/dto/VehicleMessageForCorpAddCmd.java | 3 +++ .../java/com/zcloud/primeport/dto/VehicleMessageUpdateCmd.java | 3 +++ .../zcloud/primeport/dto/clientobject/VehicleDeptInfoCO.java | 3 +++ .../zcloud/primeport/dto/clientobject/VehicleMessageCO.java | 2 ++ .../com/zcloud/primeport/domain/model/VehicleMessageE.java | 1 + .../primeport/persistence/dataobject/VehicleMessageDO.java | 3 ++- 9 files changed, 23 insertions(+), 1 deletion(-) diff --git a/web-client/src/main/java/com/zcloud/primeport/dto/VehicleInspectionAddCmd.java b/web-client/src/main/java/com/zcloud/primeport/dto/VehicleInspectionAddCmd.java index 1bf423d..7cc0e1a 100644 --- a/web-client/src/main/java/com/zcloud/primeport/dto/VehicleInspectionAddCmd.java +++ b/web-client/src/main/java/com/zcloud/primeport/dto/VehicleInspectionAddCmd.java @@ -31,6 +31,9 @@ public class VehicleInspectionAddCmd extends Command { @ApiModelProperty(value = "车辆类型", name = "vehicleType", required = true) @NotEmpty(message = "车辆类型不能为空") private String vehicleType; + @ApiModelProperty(value = "车辆类型-名字", name = "vehicleTypeName", required = true) + @NotEmpty(message = "车辆类型不能为空-名字") + private String vehicleTypeName; @ApiModelProperty(value = "访问起始时间", name = "visitStartTime", required = true) @NotEmpty(message = "访问起始时间不能为空") private Date visitStartTime; diff --git a/web-client/src/main/java/com/zcloud/primeport/dto/VehicleInspectionUpdateCmd.java b/web-client/src/main/java/com/zcloud/primeport/dto/VehicleInspectionUpdateCmd.java index aaab5ba..8c55078 100644 --- a/web-client/src/main/java/com/zcloud/primeport/dto/VehicleInspectionUpdateCmd.java +++ b/web-client/src/main/java/com/zcloud/primeport/dto/VehicleInspectionUpdateCmd.java @@ -34,6 +34,9 @@ public class VehicleInspectionUpdateCmd extends Command { @ApiModelProperty(value = "车辆类型", name = "vehicleType", required = true) @NotEmpty(message = "车辆类型不能为空") private String vehicleType; + @ApiModelProperty(value = "车辆类型-名字", name = "vehicleTypeName", required = true) + @NotEmpty(message = "车辆类型不能为空-名字") + private String vehicleTypeName; @ApiModelProperty(value = "访问起始时间", name = "visitStartTime", required = true) @NotEmpty(message = "访问起始时间不能为空") private Date visitStartTime; diff --git a/web-client/src/main/java/com/zcloud/primeport/dto/VehicleMessageAddCmd.java b/web-client/src/main/java/com/zcloud/primeport/dto/VehicleMessageAddCmd.java index 709d2d1..bd81fee 100644 --- a/web-client/src/main/java/com/zcloud/primeport/dto/VehicleMessageAddCmd.java +++ b/web-client/src/main/java/com/zcloud/primeport/dto/VehicleMessageAddCmd.java @@ -37,6 +37,9 @@ public class VehicleMessageAddCmd extends Command { @ApiModelProperty(value = "车辆类型", name = "vehicleType", required = true) @NotEmpty(message = "车辆类型不能为空") private String vehicleType; + @ApiModelProperty(value = "车辆类型-名字", name = "vehicleTypeName", required = true) + @NotEmpty(message = "车辆类型不能为空-名字") + private String vehicleTypeName; @ApiModelProperty(value = "车辆所属类型 0-员工车辆 1- 单位车辆 2-相关方车辆3：货运车辆,4:临时车辆", name = "vehicleBelongType", required = true) @NotEmpty(message = "车辆所属类型 0-员工车辆 1- 单位车辆 2-相关方车辆3：货运车辆,4:临时车辆不能为空") private Integer vehicleBelongType; diff --git a/web-client/src/main/java/com/zcloud/primeport/dto/VehicleMessageForCorpAddCmd.java b/web-client/src/main/java/com/zcloud/primeport/dto/VehicleMessageForCorpAddCmd.java index a42c5a7..9835bc1 100644 --- a/web-client/src/main/java/com/zcloud/primeport/dto/VehicleMessageForCorpAddCmd.java +++ b/web-client/src/main/java/com/zcloud/primeport/dto/VehicleMessageForCorpAddCmd.java @@ -34,6 +34,9 @@ public class VehicleMessageForCorpAddCmd extends Command { @ApiModelProperty(value = "车辆类型", name = "vehicleType", required = true) @NotEmpty(message = "车辆类型") private String vehicleType; + @ApiModelProperty(value = "车辆类型-名字", name = "vehicleTypeName", required = true) + @NotEmpty(message = "车辆类型不能为空-名字") + private String vehicleTypeName; @ApiModelProperty(value = "车辆所属类型 0-员工车辆 1- 单位车辆 2-外部车辆3：货运车辆", name = "vehicleBelongType", required = true) @NotNull(message = "车辆所属类型 0-员工车辆 1- 单位车辆 2-外部车辆3：货运车辆不能为空") diff --git a/web-client/src/main/java/com/zcloud/primeport/dto/VehicleMessageUpdateCmd.java b/web-client/src/main/java/com/zcloud/primeport/dto/VehicleMessageUpdateCmd.java index 1396ecf..14b23ef 100644 --- a/web-client/src/main/java/com/zcloud/primeport/dto/VehicleMessageUpdateCmd.java +++ b/web-client/src/main/java/com/zcloud/primeport/dto/VehicleMessageUpdateCmd.java @@ -36,6 +36,9 @@ public class VehicleMessageUpdateCmd extends Command { @ApiModelProperty(value = "车辆类型 0-货车 1- 轿车 2-大巴客车", name = "vehicleType", required = true) @NotEmpty(message = "车辆类型 0-货车 1- 轿车 2-大巴客车不能为空") private String vehicleType; + @ApiModelProperty(value = "车辆类型-名字", name = "vehicleTypeName", required = true) + @NotEmpty(message = "车辆类型不能为空-名字") + private String vehicleTypeName; @ApiModelProperty(value = "车辆所属类型 0-员工车辆 1- 单位车辆 2-外部车辆3：货运车辆", name = "vehicleBelongType", required = true) @NotNull(message = "车辆所属类型 0-员工车辆 1- 单位车辆 2-外部车辆3：货运车辆不能为空") private Integer vehicleBelongType; diff --git a/web-client/src/main/java/com/zcloud/primeport/dto/clientobject/VehicleDeptInfoCO.java b/web-client/src/main/java/com/zcloud/primeport/dto/clientobject/VehicleDeptInfoCO.java index 39aa3b3..ac4fb0f 100644 --- a/web-client/src/main/java/com/zcloud/primeport/dto/clientobject/VehicleDeptInfoCO.java +++ b/web-client/src/main/java/com/zcloud/primeport/dto/clientobject/VehicleDeptInfoCO.java @@ -27,6 +27,9 @@ public class VehicleDeptInfoCO extends ClientObject { @ApiModelProperty(value = "车辆类型", name = "vehicleType", required = true) @NotEmpty(message = "车辆类型不能为空") private String vehicleType; + @ApiModelProperty(value = "车辆类型-名字", name = "vehicleTypeName", required = true) + @NotEmpty(message = "车辆类型不能为空-名字") + private String vehicleTypeName; @ApiModelProperty(value = "访问起始时间", name = "visitStartTime", required = true) @NotEmpty(message = "访问起始时间不能为空") private Date visitStartTime; diff --git a/web-client/src/main/java/com/zcloud/primeport/dto/clientobject/VehicleMessageCO.java b/web-client/src/main/java/com/zcloud/primeport/dto/clientobject/VehicleMessageCO.java index ddade0d..1099faa 100644 --- a/web-client/src/main/java/com/zcloud/primeport/dto/clientobject/VehicleMessageCO.java +++ b/web-client/src/main/java/com/zcloud/primeport/dto/clientobject/VehicleMessageCO.java @@ -30,6 +30,8 @@ public class VehicleMessageCO extends ClientObject { //车辆类型 @ApiModelProperty(value = "车辆类型") private String vehicleType; + @ApiModelProperty(value = "车辆类型-名字", name = "vehicleTypeName", required = true) + private String vehicleTypeName; //车辆所属类型 0-员工车辆 1- 单位车辆 2-相关方车辆3：货运车辆,4:临时车辆 @ApiModelProperty(value = "车辆所属类型 0-员工车辆 1- 单位车辆 2-相关方车辆3：货运车辆,4:临时车辆") private Integer vehicleBelongType; diff --git a/web-domain/src/main/java/com/zcloud/primeport/domain/model/VehicleMessageE.java b/web-domain/src/main/java/com/zcloud/primeport/domain/model/VehicleMessageE.java index c83e962..42efb63 100644 --- a/web-domain/src/main/java/com/zcloud/primeport/domain/model/VehicleMessageE.java +++ b/web-domain/src/main/java/com/zcloud/primeport/domain/model/VehicleMessageE.java @@ -29,6 +29,7 @@ public class VehicleMessageE extends BaseE { private String licenceNo; //车辆类型 private String vehicleType; + private String vehicleTypeName; //车辆所属类型 0-员工车辆 1- 单位车辆 2-相关方车辆3：货运车辆,4:临时车辆 5 检查车 private Integer vehicleBelongType; //所属车队ID diff --git a/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/dataobject/VehicleMessageDO.java b/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/dataobject/VehicleMessageDO.java index f2f2334..263de71 100644 --- a/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/dataobject/VehicleMessageDO.java +++ b/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/dataobject/VehicleMessageDO.java @@ -36,7 +36,8 @@ public class VehicleMessageDO extends BaseDO { //车辆类型 @ApiModelProperty(value = "车辆类型") private String vehicleType; - //车辆所属类型 0-员工车辆 1- 单位车辆 2-相关方车辆3：货运车辆,4:临时车辆 + @ApiModelProperty(value = "车辆类型-名字") + private String vehicleTypeName; @ApiModelProperty(value = "车辆所属类型 0-员工车辆 1- 单位车辆 2-相关方车辆3：货运车辆,4:临时车辆") private Integer vehicleBelongType; //所属车队ID