From dcb0643a03facb0d0d9da327aff4d332c6947276 Mon Sep 17 00:00:00 2001 From: guoyuepeng <770272267@qq.com> Date: Wed, 19 Nov 2025 13:49:41 +0800 Subject: [PATCH] =?UTF-8?q?1.=E5=8F=A3=E9=97=A8=E9=97=A8=E7=A6=81-?= =?UTF-8?q?=E8=BD=A6=E8=BE=86=E4=BF=A1=E6=81=AF=E6=9F=A5=E8=AF=A2=E7=AD=89?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../web/VehicleMessageController.java | 38 +++++++++---------- .../command/VehicleMessageAddExe.java | 2 +- .../command/VehicleMessageUpdateExe.java | 33 +++++++++++++++- .../convertor/VehicleMessageCoConvertor.java | 1 + .../command/query/VehicleMessageQueryExe.java | 5 +++ .../service/VehicleMessageServiceImpl.java | 11 ++++++ .../primeport/api/VehicleMessageServiceI.java | 3 ++ .../primeport/dto/VehicleAuditLogAddCmd.java | 9 +++-- .../dto/VehicleAuditLogUpdateCmd.java | 9 +++-- .../primeport/dto/VehicleMessagePageQry.java | 12 +++++- .../dto/VehicleMessageUpdateCmd.java | 15 +++++++- .../dto/clientobject/VehicleAuditLogCO.java | 9 +++-- .../domain/gateway/VehicleMessageGateway.java | 4 ++ .../domain/model/VehicleAuditLogE.java | 25 ++++++------ .../domain/model/VehicleMessageE.java | 7 ++-- .../VehicleMessageGatewayImpl.java | 14 ++++++- .../dataobject/VehicleAuditLogDO.java | 9 +++-- 17 files changed, 155 insertions(+), 51 deletions(-) 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 775a3d9..9dc38ae 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 @@ -54,19 +54,6 @@ public class VehicleMessageController { return MultiResponse.of(new ArrayList()); } - @ApiOperation("详情") - @GetMapping("/{id}") - public SingleResponse getInfoById(@PathVariable("id") Long id) { - return SingleResponse.of(new VehicleMessageCO()); - } - - @ApiOperation("删除") - @DeleteMapping("/{id}") - public Response remove(@PathVariable("id") Long id) { - vehicleMessageService.remove(id); - return SingleResponse.buildSuccess(); - } - @ApiOperation("删除多个") @DeleteMapping("/ids") public Response removeBatch(@RequestParam Long[] ids) { @@ -74,17 +61,28 @@ public class VehicleMessageController { return SingleResponse.buildSuccess(); } - @ApiOperation("修改") - @PutMapping("/edit") - public SingleResponse edit(@Validated @RequestBody VehicleMessageUpdateCmd vehicleMessageUpdateCmd) { - vehicleMessageService.edit(vehicleMessageUpdateCmd); - return SingleResponse.buildSuccess(); - } - @ApiOperation("新增-监管端,分子公司人员车辆") @PostMapping("/saveFroCorp") public SingleResponse addForCorp(@Validated @RequestBody VehicleMessageForCorpAddCmd cmd) { return vehicleMessageService.addForCorp(cmd); } + @ApiOperation("修改") + @PutMapping("/editFroCorp") + public SingleResponse editFroCorp(@Validated @RequestBody VehicleMessageUpdateCmd updateCmd) { + vehicleMessageService.editForCorp(updateCmd); + return SingleResponse.buildSuccess(); + } + @ApiOperation("删除") + @DeleteMapping("/{id}") + public Response remove(@PathVariable("id") Long id) { + vehicleMessageService.remove(id); + return SingleResponse.buildSuccess(); + } + @ApiOperation("详情") + @GetMapping("/{id}") + public SingleResponse getInfoById(@PathVariable("id") Long id) { + VehicleMessageCO infoById = vehicleMessageService.getInfoById(id); + return SingleResponse.of(infoById); + } } diff --git a/web-app/src/main/java/com/zcloud/primeport/command/VehicleMessageAddExe.java b/web-app/src/main/java/com/zcloud/primeport/command/VehicleMessageAddExe.java index 9e9e52a..326b6db 100644 --- a/web-app/src/main/java/com/zcloud/primeport/command/VehicleMessageAddExe.java +++ b/web-app/src/main/java/com/zcloud/primeport/command/VehicleMessageAddExe.java @@ -53,7 +53,7 @@ public class VehicleMessageAddExe { if (!Tools.isEmpty(cmd.getApprovalUserId())){ VehicleAuditLogE vehicleAuditLogE = new VehicleAuditLogE(); BeanUtils.copyProperties(cmd, vehicleAuditLogE); - vehicleAuditLogE.addFroVehicleLog(vehicleAuditLogE,add.getId()); // 添加审批信息 + vehicleAuditLogE.addFroVehicleLog(vehicleAuditLogE,add.getId(),1); // 添加审批信息 res = vehicleAuditLogGateway.add(vehicleAuditLogE); // 添加审批信息 } } catch (Exception e) { 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 1f76f72..1a7ef43 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 @@ -1,6 +1,9 @@ package com.zcloud.primeport.command; import com.alibaba.cola.exception.BizException; +import com.zcloud.gbscommon.utils.Tools; +import com.zcloud.primeport.domain.gateway.VehicleAuditLogGateway; import com.zcloud.primeport.domain.gateway.VehicleMessageGateway; +import com.zcloud.primeport.domain.model.VehicleAuditLogE; import com.zcloud.primeport.domain.model.VehicleMessageE; import com.zcloud.primeport.dto.VehicleMessageUpdateCmd; import lombok.AllArgsConstructor; @@ -20,7 +23,7 @@ import org.springframework.transaction.annotation.Transactional; @AllArgsConstructor public class VehicleMessageUpdateExe { private final VehicleMessageGateway vehicleMessageGateway; - + private final VehicleAuditLogGateway vehicleAuditLogGateway; @Transactional(rollbackFor = Exception.class) public void execute(VehicleMessageUpdateCmd vehicleMessageUpdateCmd) { VehicleMessageE vehicleMessageE = new VehicleMessageE(); @@ -30,5 +33,33 @@ public class VehicleMessageUpdateExe { throw new BizException("修改失败"); } } + + /** + * 企业端和监管端修改车辆信息 + * @param vehicleMessageUpdateCmd + */ + @Transactional(rollbackFor = Exception.class) + public void executeFormCorp(VehicleMessageUpdateCmd vehicleMessageUpdateCmd) { + VehicleMessageE vehicleMessageE = new VehicleMessageE(); + BeanUtils.copyProperties(vehicleMessageUpdateCmd, vehicleMessageE); + vehicleMessageE.updateFromCorp(vehicleMessageE); //车辆状态变成不通过 + VehicleMessageE infoById = vehicleMessageGateway.getInfoById(vehicleMessageUpdateCmd.getId()); + if (infoById == null){ + throw new BizException("车辆信息不存在"); + } + if (infoById.getIsAudit() == 1){ + throw new BizException("车辆信息正在审核"); + } + boolean res = vehicleMessageGateway.update(vehicleMessageE); //修改车辆信息 + if (!Tools.isEmpty(vehicleMessageUpdateCmd.getApprovalUserId())){ //新增一个审批记录 + VehicleAuditLogE vehicleAuditLogE = new VehicleAuditLogE(); + BeanUtils.copyProperties(vehicleMessageUpdateCmd, vehicleAuditLogE); + vehicleAuditLogE.addFroVehicleLog(vehicleAuditLogE,vehicleMessageUpdateCmd.getId(),2); // 添加审批信息 + res = vehicleAuditLogGateway.add(vehicleAuditLogE); // 添加审批信息 + } + if (!res) { + throw new BizException("修改失败"); + } + } } diff --git a/web-app/src/main/java/com/zcloud/primeport/command/convertor/VehicleMessageCoConvertor.java b/web-app/src/main/java/com/zcloud/primeport/command/convertor/VehicleMessageCoConvertor.java index e3b84c0..accbd06 100644 --- a/web-app/src/main/java/com/zcloud/primeport/command/convertor/VehicleMessageCoConvertor.java +++ b/web-app/src/main/java/com/zcloud/primeport/command/convertor/VehicleMessageCoConvertor.java @@ -19,5 +19,6 @@ public interface VehicleMessageCoConvertor { * @return */ List converDOsToCOs(List vehicleMessageDOs); + VehicleMessageCO converDOsToCOs(VehicleMessageDO vehicleMessageDOs); } diff --git a/web-app/src/main/java/com/zcloud/primeport/command/query/VehicleMessageQueryExe.java b/web-app/src/main/java/com/zcloud/primeport/command/query/VehicleMessageQueryExe.java index b702560..753c0f3 100644 --- a/web-app/src/main/java/com/zcloud/primeport/command/query/VehicleMessageQueryExe.java +++ b/web-app/src/main/java/com/zcloud/primeport/command/query/VehicleMessageQueryExe.java @@ -38,5 +38,10 @@ public class VehicleMessageQueryExe { List examCenterCOS = vehicleMessageCoConvertor.converDOsToCOs(pageResponse.getData()); return PageResponse.of(examCenterCOS, pageResponse.getTotalCount(), pageResponse.getPageSize(), pageResponse.getPageIndex()); } + public VehicleMessageCO queryById(Long id) { + VehicleMessageDO byId = vehicleMessageRepository.getById(id); + VehicleMessageCO vehicleMessageCO = vehicleMessageCoConvertor.converDOsToCOs(byId); + return vehicleMessageCO; + } } diff --git a/web-app/src/main/java/com/zcloud/primeport/service/VehicleMessageServiceImpl.java b/web-app/src/main/java/com/zcloud/primeport/service/VehicleMessageServiceImpl.java index e6ceaa7..a325a1d 100644 --- a/web-app/src/main/java/com/zcloud/primeport/service/VehicleMessageServiceImpl.java +++ b/web-app/src/main/java/com/zcloud/primeport/service/VehicleMessageServiceImpl.java @@ -60,5 +60,16 @@ public class VehicleMessageServiceImpl implements VehicleMessageServiceI { vehicleMessageAddExe.executeForCorp(cmdCorp); return SingleResponse.buildSuccess(); } + + @Override + public void editForCorp(VehicleMessageUpdateCmd vehicleMessageUpdateCmd) { + vehicleMessageUpdateExe.executeFormCorp(vehicleMessageUpdateCmd); + } + + @Override + public VehicleMessageCO getInfoById(Long id) { + VehicleMessageCO vehicleMessageCO = vehicleMessageQueryExe.queryById(id); + return vehicleMessageCO; + } } 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 1fee6cb..49a42d9 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 @@ -26,6 +26,9 @@ public interface VehicleMessageServiceI { void removeBatch(Long[] ids); SingleResponse addForCorp (VehicleMessageForCorpAddCmd cmdCorp); + void editForCorp (VehicleMessageUpdateCmd cmd); + + VehicleMessageCO getInfoById(Long id); } diff --git a/web-client/src/main/java/com/zcloud/primeport/dto/VehicleAuditLogAddCmd.java b/web-client/src/main/java/com/zcloud/primeport/dto/VehicleAuditLogAddCmd.java index 6d26a06..88fd437 100644 --- a/web-client/src/main/java/com/zcloud/primeport/dto/VehicleAuditLogAddCmd.java +++ b/web-client/src/main/java/com/zcloud/primeport/dto/VehicleAuditLogAddCmd.java @@ -22,9 +22,12 @@ public class VehicleAuditLogAddCmd extends Command { @ApiModelProperty(value = "id", name = "id", required = true) @NotEmpty(message = "id不能为空") private Long id; - @ApiModelProperty(value = "业务id", name = "vehicleAuditLogId", required = true) - @NotEmpty(message = "业务id不能为空") - private String vehicleAuditLogId; + @ApiModelProperty(value = "审批批次(1.普通车辆.2危险化学品车辆)", name = "batchType", required = true) + @NotEmpty(message = "审批批次(1.普通车辆.2危险化学品车辆)不能为空") + private Integer batchType; + @ApiModelProperty(value = "审批状态(0,申请;2.更新)", name = "batchState", required = true) + @NotEmpty(message = "审批状态(0,申请;2.更新)不能为空") + private Integer batchState; @ApiModelProperty(value = "审批批次(审批全流程,一次申请一次id)", name = "batchId", required = true) @NotEmpty(message = "审批批次(审批全流程,一次申请一次id)不能为空") private String batchId; diff --git a/web-client/src/main/java/com/zcloud/primeport/dto/VehicleAuditLogUpdateCmd.java b/web-client/src/main/java/com/zcloud/primeport/dto/VehicleAuditLogUpdateCmd.java index 92722c2..fb9008f 100644 --- a/web-client/src/main/java/com/zcloud/primeport/dto/VehicleAuditLogUpdateCmd.java +++ b/web-client/src/main/java/com/zcloud/primeport/dto/VehicleAuditLogUpdateCmd.java @@ -28,9 +28,12 @@ public class VehicleAuditLogUpdateCmd extends Command { @ApiModelProperty(value = "业务id", name = "vehicleAuditLogId", required = true) @NotEmpty(message = "业务id不能为空") private String vehicleAuditLogId; - @ApiModelProperty(value = "审批批次(审批全流程,一次申请一次id)", name = "batchId", required = true) - @NotEmpty(message = "审批批次(审批全流程,一次申请一次id)不能为空") - private String batchId; + @ApiModelProperty(value = "审批批次(1.普通车辆.2危险化学品车辆)", name = "batchType", required = true) + @NotEmpty(message = "审批批次(1.普通车辆.2危险化学品车辆)不能为空") + private Integer batchType; + @ApiModelProperty(value = "审批状态(0,申请;2.更新)", name = "batchState", required = true) + @NotEmpty(message = "审批状态(0,申请;2.更新)不能为空") + private Integer batchState; @ApiModelProperty(value = "车辆id", name = "vehicleMessageId", required = true) @NotEmpty(message = "车辆id不能为空") private Long vehicleMessageId; 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 1aa75e9..9cd6c93 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 @@ -25,6 +25,16 @@ public class VehicleMessagePageQry extends PageQuery { * - `le`: 小于等于比较查询 * - `ne`: 不等比较查询，对应SQL的!=操作符 */ - private Integer likeLicenceType; + @ApiModelProperty(value = "车牌号") + private String likeLicenceNo; + + @ApiModelProperty(value = "车辆所属人姓名") + private String liekeEmployeeVehicleUserName; + + @ApiModelProperty(value = "车辆所属部门id") + private String eqVehicleDepartmentId; + + @ApiModelProperty(value = "企业ID") + private String eqCorpId; } 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 0afd99d..115e820 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 @@ -90,7 +90,7 @@ public class VehicleMessageUpdateCmd extends Command { private String employeeVehicleUserName; @ApiModelProperty(value = "企业ID(~~~~~~)", name = "corpinfoId", required = true) @NotEmpty(message = "企业ID(~~~~~~)不能为空") - private Long corpinfoId; + private Long corpId; @ApiModelProperty(value = "排放标准:level1 -> 国一level2 -> 国二level3 -> 国三level4 -> 国四level5 -> 国五level6 -> 国六", name = "emissionStandards", required = true) @NotEmpty(message = "排放标准:level1 -> 国一level2 -> 国二level3 -> 国三level4 -> 国四level5 -> 国五level6 -> 国六不能为空") private String emissionStandards; @@ -106,5 +106,18 @@ public class VehicleMessageUpdateCmd extends Command { @ApiModelProperty(value = "访问结束时间", name = "visitEndTime", required = true) @NotEmpty(message = "访问结束时间不能为空") private String visitEndTime; + + + @ApiModelProperty(value = "审核人ID", name = "approvalUserId") + public Long approvalUserId; + + @ApiModelProperty(value = "审核人名字", name = "approvalUserName") + public String approvalUserName; + + @ApiModelProperty(value = "审核人部门ID", name = "approvalDeptId") + public Long approvalDeptId; + + @ApiModelProperty(value = "审核人部门名字", name = "approvalDeptName") + public String approvalDeptName; } diff --git a/web-client/src/main/java/com/zcloud/primeport/dto/clientobject/VehicleAuditLogCO.java b/web-client/src/main/java/com/zcloud/primeport/dto/clientobject/VehicleAuditLogCO.java index aa97745..8bcff32 100644 --- a/web-client/src/main/java/com/zcloud/primeport/dto/clientobject/VehicleAuditLogCO.java +++ b/web-client/src/main/java/com/zcloud/primeport/dto/clientobject/VehicleAuditLogCO.java @@ -18,9 +18,12 @@ public class VehicleAuditLogCO extends ClientObject { //业务id @ApiModelProperty(value = "业务id") private String vehicleAuditLogId; - //审批批次(审批全流程,一次申请一次id) - @ApiModelProperty(value = "审批批次(审批全流程,一次申请一次id)") - private String batchId; + //审批批次(1.普通车辆.2危险化学品车辆) + @ApiModelProperty(value = "审批批次(1.普通车辆.2危险化学品车辆)") + private Integer batchType; + //审批状态(0,申请;2.更新) + @ApiModelProperty(value = "审批状态(0,申请;2.更新)") + private Integer batchState; //车辆id @ApiModelProperty(value = "车辆id") private Long vehicleMessageId; diff --git a/web-domain/src/main/java/com/zcloud/primeport/domain/gateway/VehicleMessageGateway.java b/web-domain/src/main/java/com/zcloud/primeport/domain/gateway/VehicleMessageGateway.java index 8e835e5..57a1279 100644 --- a/web-domain/src/main/java/com/zcloud/primeport/domain/gateway/VehicleMessageGateway.java +++ b/web-domain/src/main/java/com/zcloud/primeport/domain/gateway/VehicleMessageGateway.java @@ -25,6 +25,10 @@ public interface VehicleMessageGateway { Boolean deletedVehicleMessageById(Long id); Boolean deletedVehicleMessageByIds(Long[] id); + /** + * 详情 + */ + VehicleMessageE getInfoById(Long id); } diff --git a/web-domain/src/main/java/com/zcloud/primeport/domain/model/VehicleAuditLogE.java b/web-domain/src/main/java/com/zcloud/primeport/domain/model/VehicleAuditLogE.java index b1f91b3..e992ec2 100644 --- a/web-domain/src/main/java/com/zcloud/primeport/domain/model/VehicleAuditLogE.java +++ b/web-domain/src/main/java/com/zcloud/primeport/domain/model/VehicleAuditLogE.java @@ -22,8 +22,10 @@ public class VehicleAuditLogE extends BaseE { private Long id; //业务id private String vehicleAuditLogId; - //审批批次(审批全流程,一次申请一次id) - private String batchId; + //审批批次(1.普通车辆.2危险化学品车辆) + private Integer batchType; + //审批状态(0,申请;2.更新) + private Integer batchState; //车辆id private Long vehicleMessageId; //审批人id @@ -52,16 +54,17 @@ public class VehicleAuditLogE extends BaseE { * 申请车辆的时候,审批信息. * @param examTypeE */ - public void addFroVehicleLog ( VehicleAuditLogE examTypeE,Long vehicleMessageId) { - userId = approvalUserId; - userName = approvalUserName; - deptId = approvalDeptId; + public void addFroVehicleLog ( VehicleAuditLogE examTypeE,Long vehicleMessageId,Integer batchState) { + this.userId = approvalUserId; + this.userName = approvalUserName; + this.deptId = approvalDeptId; this.deptName = approvalDeptName; - this.batchId = "1"; - this.vehicleMessageId = vehicleMessageId; - this.status = 1; - stepType = 0; - stepSort = 1; + this.batchState = batchState; //审批状态(0,申请;2.更新) + this.batchType = 1; //审批批次(1.普通车辆.2危险化学品车辆) + this.vehicleMessageId = vehicleMessageId; // //车辆id + this.status = 1; //审批状态(1未开始.2通过.3不通过) + this.stepType = 0; //审批状态(0正常,1.废除) + this.stepSort = 1; //审批步骤排序 } } 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 984a1a3..c722021 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 @@ -73,8 +73,9 @@ public class VehicleMessageE extends BaseE { this.visitEndTime = DateUtil.fomatDate(DateUtil.getCurrYearLast()); return e; } - - - + public VehicleMessageE updateFromCorp( VehicleMessageE e) { + this.isAudit = 0;//未审核 + return e; + } } diff --git a/web-infrastructure/src/main/java/com/zcloud/primeport/gatewayimpl/VehicleMessageGatewayImpl.java b/web-infrastructure/src/main/java/com/zcloud/primeport/gatewayimpl/VehicleMessageGatewayImpl.java index 159f09b..ecf665f 100644 --- a/web-infrastructure/src/main/java/com/zcloud/primeport/gatewayimpl/VehicleMessageGatewayImpl.java +++ b/web-infrastructure/src/main/java/com/zcloud/primeport/gatewayimpl/VehicleMessageGatewayImpl.java @@ -40,12 +40,24 @@ public class VehicleMessageGatewayImpl implements VehicleMessageGateway { @Override public Boolean deletedVehicleMessageById(Long id) { - return vehicleMessageRepository.removeById(id); + VehicleMessageDO d = new VehicleMessageDO(); + d.setDeleteEnum("TRUE"); + d.setId( id); + boolean updateById = vehicleMessageRepository.updateById(d); + return updateById; } @Override public Boolean deletedVehicleMessageByIds(Long[] ids) { return vehicleMessageRepository.removeByIds(Arrays.asList(ids)); } + + @Override + public VehicleMessageE getInfoById(Long id) { + VehicleMessageDO repositoryById = vehicleMessageRepository.getById(id); + VehicleMessageE vehicleMessageE = new VehicleMessageE(); + BeanUtils.copyProperties(repositoryById, vehicleMessageE); + return vehicleMessageE; + } } diff --git a/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/dataobject/VehicleAuditLogDO.java b/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/dataobject/VehicleAuditLogDO.java index 2f9bf70..c2ba8d4 100644 --- a/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/dataobject/VehicleAuditLogDO.java +++ b/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/dataobject/VehicleAuditLogDO.java @@ -26,9 +26,12 @@ public class VehicleAuditLogDO extends BaseDO { //业务id @ApiModelProperty(value = "业务id") private String vehicleAuditLogId; - //审批批次(审批全流程,一次申请一次id) - @ApiModelProperty(value = "审批批次(审批全流程,一次申请一次id)") - private String batchId; + //审批批次(1.普通车辆.2危险化学品车辆) + @ApiModelProperty(value = "审批批次(1.普通车辆.2危险化学品车辆)") + private Integer batchType; + //审批状态(0,申请;2.更新) + @ApiModelProperty(value = "审批状态(0,申请;2.更新)") + private Integer batchState; //车辆id @ApiModelProperty(value = "车辆id") private Long vehicleMessageId;