diff --git a/web-adapter/src/main/java/com/zcloud/primeport/web/VehicleMessageController.java b/web-adapter/src/main/java/com/zcloud/primeport/web/VehicleMessageController.java index c0225b7..17d75f2 100644 --- a/web-adapter/src/main/java/com/zcloud/primeport/web/VehicleMessageController.java +++ b/web-adapter/src/main/java/com/zcloud/primeport/web/VehicleMessageController.java @@ -62,9 +62,7 @@ public class VehicleMessageController { @PostMapping("/list") public PageResponse page(@RequestBody VehicleMessagePageQry qry) { SSOUser currentUser = AuthContext.getCurrentUser(); - if (!Tools.isEmpty(qry.getIsCorpType()) && !"2".equals(qry.getIsCorpType())) { - qry.setCorpByCorpType(currentUser.getTenantParentIds()); - } + qry.setCorpByCorpType(currentUser.getTenantParentIds()); return vehicleMessageService.listPage(qry); } /** @@ -91,12 +89,5 @@ public class VehicleMessageController { return SingleResponse.of(infoById); } - // accessStatus - @ApiOperation("修改车辆进出状态") - @PutMapping("/editAccessStatus") - public SingleResponse editFro(@PathVariable("id") Long id) { -// vehicleMessageService.editForCorp(updateCmd); - return SingleResponse.buildSuccess(); - } } diff --git a/web-app/src/main/java/com/zcloud/primeport/command/VehicleMessageUpdateExe.java b/web-app/src/main/java/com/zcloud/primeport/command/VehicleMessageUpdateExe.java index 9cc8f95..10c3ad0 100644 --- a/web-app/src/main/java/com/zcloud/primeport/command/VehicleMessageUpdateExe.java +++ b/web-app/src/main/java/com/zcloud/primeport/command/VehicleMessageUpdateExe.java @@ -48,7 +48,7 @@ public class VehicleMessageUpdateExe { if (infoById == null){ throw new BizException("车辆信息不存在"); } - if (infoById.getIsAudit() == 1){ + if (infoById.getIsAudit() != 2){ throw new BizException("车辆信息正在审核"); } boolean res = vehicleMessageGateway.update(vehicleMessageE); //修改车辆信息 diff --git a/web-client/src/main/java/com/zcloud/primeport/api/VehicleMessageServiceI.java b/web-client/src/main/java/com/zcloud/primeport/api/VehicleMessageServiceI.java index 7b9dae5..f5a8bf4 100644 --- a/web-client/src/main/java/com/zcloud/primeport/api/VehicleMessageServiceI.java +++ b/web-client/src/main/java/com/zcloud/primeport/api/VehicleMessageServiceI.java @@ -35,5 +35,7 @@ public interface VehicleMessageServiceI { VehicleMessageCO infoByLicenceNo(String licenceNo ); + + } diff --git a/web-client/src/main/java/com/zcloud/primeport/dto/VehicleMessagePageQry.java b/web-client/src/main/java/com/zcloud/primeport/dto/VehicleMessagePageQry.java index e26dfdb..bc80975 100644 --- a/web-client/src/main/java/com/zcloud/primeport/dto/VehicleMessagePageQry.java +++ b/web-client/src/main/java/com/zcloud/primeport/dto/VehicleMessagePageQry.java @@ -33,13 +33,13 @@ public class VehicleMessagePageQry extends PageQuery { private String eqEmployeeVehicleUserId; @ApiModelProperty(value = "车辆所属人姓名") - private String liekeEmployeeVehicleUserName; + private String likeEmployeeVehicleUserName; @ApiModelProperty(value = "车辆所属部门id") private String eqVehicleDepartmentId; @ApiModelProperty(value = "车辆所属部门名称") - private String liekeVehicleDepartmentName; + private String likeVehicleDepartmentName; @ApiModelProperty(value = "通行港区(0-全部 1-东港区 2-西港区)") @@ -59,15 +59,6 @@ public class VehicleMessagePageQry extends PageQuery { @ApiModelProperty(value = "是否审核") private String eqIsAudit; - - - - /** - * 企业类型(0-普通企业,1-集团单位,2-股份单位,3-相关方企业,4-货主单位,5-驻港单位) - */ - @ApiModelProperty(value = "企业类型") - private String isCorpType; - /** * 获取监管端id * @param tenantParentIds