diff --git a/web-adapter/src/main/java/com/zcloud/primeport/web/VehicleApplyController.java b/web-adapter/src/main/java/com/zcloud/primeport/web/VehicleApplyController.java index 28e00a6..c80ad74 100644 --- a/web-adapter/src/main/java/com/zcloud/primeport/web/VehicleApplyController.java +++ b/web-adapter/src/main/java/com/zcloud/primeport/web/VehicleApplyController.java @@ -53,11 +53,11 @@ public class VehicleApplyController { vehicleApplyService.inspectCarEdit(cmd); return Response.buildSuccess(); } - @ApiOperation("新增-临时访客") - @PostMapping("/saveTemporaryVisitors") - public SingleResponse saveTemporaryVisitors(@Validated @RequestBody VehicleApplyAddCmd cmd) { - return null; - } +// @ApiOperation("新增-临时访客") +// @PostMapping("/saveTemporaryVisitors") +// public SingleResponse saveTemporaryVisitors(@Validated @RequestBody VehicleApplyAddCmd cmd) { +// return null; +// } @ApiOperation("分页") @PostMapping("/list") diff --git a/web-client/src/main/java/com/zcloud/primeport/dto/VehicleApplyAddCmd.java b/web-client/src/main/java/com/zcloud/primeport/dto/VehicleApplyAddCmd.java index a3d7089..0eba44e 100644 --- a/web-client/src/main/java/com/zcloud/primeport/dto/VehicleApplyAddCmd.java +++ b/web-client/src/main/java/com/zcloud/primeport/dto/VehicleApplyAddCmd.java @@ -22,51 +22,51 @@ import java.util.Date; @NoArgsConstructor @AllArgsConstructor public class VehicleApplyAddCmd extends Command { - @ApiModelProperty(value = "车牌类型数据字典", name = "licenceType", required = true) + @ApiModelProperty(value = "车牌类型数据字典", name = "licenceType") @NotEmpty(message = "车牌类型数据字典不能为空") private String licenceType; - @ApiModelProperty(value = "车牌类型名称0-白牌 1- 蓝牌 2-黄牌 3-绿牌 4-黑牌", name = "licenceTypeName", required = true) + @ApiModelProperty(value = "车牌类型名称0-白牌 1- 蓝牌 2-黄牌 3-绿牌 4-黑牌", name = "licenceTypeName") @NotEmpty(message = "车牌类型名称0-白牌 1- 蓝牌 2-黄牌 3-绿牌 4-黑牌不能为空") private String licenceTypeName; - @ApiModelProperty(value = "车牌号", name = "licenceNo", required = true) + @ApiModelProperty(value = "车牌号", name = "licenceNo") @NotEmpty(message = "车牌号不能为空") private String licenceNo; - @ApiModelProperty(value = "车辆类型", name = "vehicleType", required = true) + @ApiModelProperty(value = "车辆类型", name = "vehicleType") @NotEmpty(message = "车辆类型不能为空") private String vehicleType; - @ApiModelProperty(value = "车辆类型-名字", name = "vehicleTypeName", required = true) + @ApiModelProperty(value = "车辆类型-名字", name = "vehicleTypeName") @NotEmpty(message = "车辆类型-名字不能为空") private String vehicleTypeName; - @ApiModelProperty(value = "车辆所属类型 1-股份员工车辆,2-股份单位车辆,3-分公司员工车辆,4-分公司单位车辆 ,5-相关方车辆, 6:临时车辆,7检查部门车辆", name = "vehicleBelongType", required = true) + @ApiModelProperty(value = "车辆所属类型 1-股份员工车辆,2-股份单位车辆,3-分公司员工车辆,4-分公司单位车辆 ,5-相关方车辆, 6:临时车辆,7检查部门车辆", name = "vehicleBelongType") @NotEmpty(message = "车辆所属类型 1-股份员工车辆,2-股份单位车辆,3-分公司员工车辆,4-分公司单位车辆 ,5-相关方车辆, 6:临时车辆,7检查部门车辆不能为空") private String vehicleBelongType; - @ApiModelProperty(value = "授权范围港区与区域", name = "gateLevelAuthArea", required = true) + @ApiModelProperty(value = "授权范围港区与区域", name = "gateLevelAuthArea") @NotEmpty(message = "授权范围港区与区域不能为空") private String gateLevelAuthArea; - @ApiModelProperty(value = "访问起始时间", name = "visitStartTime", required = true) + @ApiModelProperty(value = "访问起始时间", name = "visitStartTime") @NotEmpty(message = "访问起始时间不能为空") private String visitStartTime; - @ApiModelProperty(value = "访问结束时间", name = "visitEndTime", required = true) + @ApiModelProperty(value = "访问结束时间", name = "visitEndTime") @NotEmpty(message = "访问结束时间不能为空") private String visitEndTime; - @ApiModelProperty(value = "排放标准名称", name = "emissionStandards", required = true) + @ApiModelProperty(value = "排放标准名称", name = "emissionStandards") private String emissionStandards; - @ApiModelProperty(value = "排放标准", name = "emissionStandardsName", required = true) + @ApiModelProperty(value = "排放标准", name = "emissionStandardsName") private String emissionStandardsName; - @ApiModelProperty(value = "行驶证照片", name = "drivingLicenseId", required = true) + @ApiModelProperty(value = "行驶证照片", name = "drivingLicenseId") @NotNull(message = "行驶证照片不能为空") private Long drivingLicenseId; - @ApiModelProperty(value = "车辆照片", name = "attachmentId", required = true) + @ApiModelProperty(value = "车辆照片", name = "attachmentId") @NotNull(message = "车辆照片不能为空") private Long attachmentId; - @ApiModelProperty(value = "告知签字", name = "informSignId", required = true) + @ApiModelProperty(value = "告知签字", name = "informSignId") private Long informSignId; - @ApiModelProperty(value = "项目id", name = "projectId", required = true) + @ApiModelProperty(value = "项目id", name = "projectId") private Long projectId; - @ApiModelProperty(value = "项目名称", name = "projectName", required = true) + @ApiModelProperty(value = "项目名称", name = "projectName") private String projectName; - @ApiModelProperty(value = "1被拉黑2未拉黑", name = "blockedFlag", required = true) - private Integer blockedFlag; +// @ApiModelProperty(value = "1被拉黑2未拉黑", name = "blockedFlag") +// private Integer blockedFlag; @ApiModelProperty(value = "口门id", name = "mkmjId") private Long mkmjId; @ApiModelProperty(value = "临时申请驾驶人手机号", name = "lsUserPhone") @@ -79,7 +79,6 @@ public class VehicleApplyAddCmd extends Command { //车辆所属企业ID @ApiModelProperty(value = "车辆所属企业ID", name = "vehicleCorpId") - private Long vehicleCorpId; @ApiModelProperty(value = "车辆所属企业名称", name = "vehicleCorpName") //车辆所属企业名称 @@ -90,19 +89,24 @@ public class VehicleApplyAddCmd extends Command { @ApiModelProperty(value = "车辆所属部门名称", name = "vehicleDepartmentName") //车辆所属部门名称 private String vehicleDepartmentName; - + @ApiModelProperty(value = "车辆所属人id", name = "employeeVehicleUserId") + //车辆所属部门id + private Long employeeVehicleUserId; + @ApiModelProperty(value = "车辆所属人名称", name = "employeeVehicleUserName") + //车辆所属部门名称 + private String employeeVehicleUserName; // 审批 - @ApiModelProperty(value = "审核企业", name = "auditCorpId", required = true) + @ApiModelProperty(value = "审核企业", name = "auditCorpId") private Long auditCorpId; - @ApiModelProperty(value = "审核企业名称", name = "auditCorpName", required = true) + @ApiModelProperty(value = "审核企业名称", name = "auditCorpName") private String auditCorpName; - @ApiModelProperty(value = "审核部门", name = "auditDeptId", required = true) + @ApiModelProperty(value = "审核部门", name = "auditDeptId") private Long auditDeptId; - @ApiModelProperty(value = "审核部门名称", name = "auditDeptName", required = true) + @ApiModelProperty(value = "审核部门名称", name = "auditDeptName") private String auditDeptName; - @ApiModelProperty(value = "审核用户", name = "auditUserId", required = true) + @ApiModelProperty(value = "审核用户", name = "auditUserId") private Long auditUserId; - @ApiModelProperty(value = "审核用户名称", name = "auditUserName", required = true) + @ApiModelProperty(value = "审核用户名称", name = "auditUserName") private String auditUserName; } diff --git a/web-client/src/main/java/com/zcloud/primeport/dto/clientobject/VehicleApplyCO.java b/web-client/src/main/java/com/zcloud/primeport/dto/clientobject/VehicleApplyCO.java index 1fac26c..5a070ba 100644 --- a/web-client/src/main/java/com/zcloud/primeport/dto/clientobject/VehicleApplyCO.java +++ b/web-client/src/main/java/com/zcloud/primeport/dto/clientobject/VehicleApplyCO.java @@ -96,8 +96,17 @@ public class VehicleApplyCO extends ClientObject { //项目名称 @ApiModelProperty(value = "项目名称") private String projectName; - @ApiModelProperty(value = "名称") + @ApiModelProperty(value = "名称,来访事由") private String remarks; + @ApiModelProperty(value = "口门id", name = "mkmjId") + private Long mkmjId; + @ApiModelProperty(value = "口门名称", name = "mkmjName") + private String mkmjName; + @ApiModelProperty(value = "临时申请驾驶人手机号", name = "lsUserPhone") + private String lsUserPhone; + @ApiModelProperty(value = "临时申请驾驶人身份证", name = "lsUserIdcard") + private String lsUserIdcard; + //1被拉黑2未拉黑 @ApiModelProperty(value = "1被拉黑2未拉黑") private Integer blockedFlag;