1.提交
parent
512280c5aa
commit
910d36317b
|
|
@ -62,9 +62,7 @@ public class VehicleMessageController {
|
||||||
@PostMapping("/list")
|
@PostMapping("/list")
|
||||||
public PageResponse<VehicleMessageCO> page(@RequestBody VehicleMessagePageQry qry) {
|
public PageResponse<VehicleMessageCO> page(@RequestBody VehicleMessagePageQry qry) {
|
||||||
SSOUser currentUser = AuthContext.getCurrentUser();
|
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);
|
return vehicleMessageService.listPage(qry);
|
||||||
}
|
}
|
||||||
/**
|
/**
|
||||||
|
|
@ -91,12 +89,5 @@ public class VehicleMessageController {
|
||||||
return SingleResponse.of(infoById);
|
return SingleResponse.of(infoById);
|
||||||
}
|
}
|
||||||
|
|
||||||
// accessStatus
|
|
||||||
@ApiOperation("修改车辆进出状态")
|
|
||||||
@PutMapping("/editAccessStatus")
|
|
||||||
public SingleResponse editFro(@PathVariable("id") Long id) {
|
|
||||||
// vehicleMessageService.editForCorp(updateCmd);
|
|
||||||
return SingleResponse.buildSuccess();
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -48,7 +48,7 @@ public class VehicleMessageUpdateExe {
|
||||||
if (infoById == null){
|
if (infoById == null){
|
||||||
throw new BizException("车辆信息不存在");
|
throw new BizException("车辆信息不存在");
|
||||||
}
|
}
|
||||||
if (infoById.getIsAudit() == 1){
|
if (infoById.getIsAudit() != 2){
|
||||||
throw new BizException("车辆信息正在审核");
|
throw new BizException("车辆信息正在审核");
|
||||||
}
|
}
|
||||||
boolean res = vehicleMessageGateway.update(vehicleMessageE); //修改车辆信息
|
boolean res = vehicleMessageGateway.update(vehicleMessageE); //修改车辆信息
|
||||||
|
|
|
||||||
|
|
@ -35,5 +35,7 @@ public interface VehicleMessageServiceI {
|
||||||
|
|
||||||
|
|
||||||
VehicleMessageCO infoByLicenceNo(String licenceNo );
|
VehicleMessageCO infoByLicenceNo(String licenceNo );
|
||||||
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -33,13 +33,13 @@ public class VehicleMessagePageQry extends PageQuery {
|
||||||
private String eqEmployeeVehicleUserId;
|
private String eqEmployeeVehicleUserId;
|
||||||
|
|
||||||
@ApiModelProperty(value = "车辆所属人姓名")
|
@ApiModelProperty(value = "车辆所属人姓名")
|
||||||
private String liekeEmployeeVehicleUserName;
|
private String likeEmployeeVehicleUserName;
|
||||||
|
|
||||||
@ApiModelProperty(value = "车辆所属部门id")
|
@ApiModelProperty(value = "车辆所属部门id")
|
||||||
private String eqVehicleDepartmentId;
|
private String eqVehicleDepartmentId;
|
||||||
|
|
||||||
@ApiModelProperty(value = "车辆所属部门名称")
|
@ApiModelProperty(value = "车辆所属部门名称")
|
||||||
private String liekeVehicleDepartmentName;
|
private String likeVehicleDepartmentName;
|
||||||
|
|
||||||
|
|
||||||
@ApiModelProperty(value = "通行港区(0-全部 1-东港区 2-西港区)")
|
@ApiModelProperty(value = "通行港区(0-全部 1-东港区 2-西港区)")
|
||||||
|
|
@ -59,15 +59,6 @@ public class VehicleMessagePageQry extends PageQuery {
|
||||||
@ApiModelProperty(value = "是否审核")
|
@ApiModelProperty(value = "是否审核")
|
||||||
private String eqIsAudit;
|
private String eqIsAudit;
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
/**
|
|
||||||
* 企业类型(0-普通企业,1-集团单位,2-股份单位,3-相关方企业,4-货主单位,5-驻港单位)
|
|
||||||
*/
|
|
||||||
@ApiModelProperty(value = "企业类型")
|
|
||||||
private String isCorpType;
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 获取监管端id
|
* 获取监管端id
|
||||||
* @param tenantParentIds
|
* @param tenantParentIds
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue