1.口门门禁-增加车辆类型

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;

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;

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;

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：货运车辆不能为空")

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;

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;

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;

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

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