From bb7aa15f73dce2d04951789b02a743d6d20a9465 Mon Sep 17 00:00:00 2001 From: dearLin <1261008090@qq.com> Date: Wed, 18 Mar 2026 09:24:16 +0800 Subject: [PATCH] =?UTF-8?q?feat=EF=BC=9A=E4=B8=B4=E6=97=B6=E8=AE=BF?= =?UTF-8?q?=E5=AE=A2=E8=BD=A6=E8=BE=86=EF=BC=8C=E4=BA=8C=E7=BB=B4=E7=A0=81?= =?UTF-8?q?=E6=89=AB=E7=A0=81=E6=9F=A5=E8=AF=A2=E5=AE=A1=E6=89=B9=E8=BF=9B?= =?UTF-8?q?=E5=BA=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../primeport/web/VehicleApplyController.java | 2 +- .../primeport/command/VehicleApplyAddExe.java | 19 +++++++------------ .../command/query/VehicleApplyQueryExe.java | 1 + .../service/VehicleApplyServiceImpl.java | 6 +++--- .../primeport/dto/VehicleAuditPageQry.java | 4 ++++ .../dto/clientobject/VehicleApplyCO.java | 2 ++ .../dto/clientobject/VehicleAuditCO.java | 10 ++++++++++ .../domain/gateway/VehicleApplyGateway.java | 2 +- .../gatewayimpl/VehicleApplyGatewayImpl.java | 4 ++-- .../dataobject/VehicleApplyDO.java | 6 ++++++ .../dataobject/VehicleAuditDO.java | 7 +++++++ .../main/resources/mapper/VehicleAuditDO.xml | 3 ++- 12 files changed, 46 insertions(+), 20 deletions(-) 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 c237e68..a0ef3fb 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 @@ -66,7 +66,7 @@ public class VehicleApplyController { return vehicleApplyService.listPage(qry); } - @ApiOperation("股份、相关方车辆审批-详情") + @ApiOperation("股份、相关方、临时车辆审批-详情") @GetMapping("/{id}") public SingleResponse getInfoById(@PathVariable("id") Long id) { return SingleResponse.of(vehicleApplyService.getInfoById(id)); diff --git a/web-app/src/main/java/com/zcloud/primeport/command/VehicleApplyAddExe.java b/web-app/src/main/java/com/zcloud/primeport/command/VehicleApplyAddExe.java index 8e8c1cd..d7d7f64 100644 --- a/web-app/src/main/java/com/zcloud/primeport/command/VehicleApplyAddExe.java +++ b/web-app/src/main/java/com/zcloud/primeport/command/VehicleApplyAddExe.java @@ -39,16 +39,17 @@ public class VehicleApplyAddExe { private final TodoListEventPusherUtil todoListEventPusherUtil; @Transactional(rollbackFor = Exception.class) - public boolean execute(VehicleApplyAddCmd cmd) { + public VehicleApplyE execute(VehicleApplyAddCmd cmd) { VehicleApplyE examTypeE = new VehicleApplyE(); BeanUtils.copyProperties(cmd, examTypeE); examTypeE.setStatusFlag(2); examTypeE.setBlockedFlag(2); + examTypeE.setMkmjPermission(2); examTypeE.setAuditFlag(AuditEnum.WAITING.getCode()); // examTypeE.setApplyTime(DateUtil.date2Str(new Date())); // 股份、分公司个人车辆 - if (cmd.getVehicleBelongType().equals(VehicleBelongTypeEnum.JGD_PRI_VEHICLES.getCode()) - || cmd.getVehicleBelongType().equals(VehicleBelongTypeEnum.FGS_PRI_VEHICLES.getCode())) { + if (cmd.getVehicleBelongType().equals(VehicleBelongTypeEnum.JGD_PRI_VEHICLES.getCode()) || cmd.getVehicleBelongType().equals(VehicleBelongTypeEnum.FGS_PRI_VEHICLES.getCode())) { + examTypeE.setMkmjPermission(1); if (cmd.getEmployeeVehicleUserId() == null) { SSOUser user = AuthContext.getCurrentUser(); if (user != null) { @@ -61,20 +62,14 @@ public class VehicleApplyAddExe { } } } - vehicleApplyGateway.add(examTypeE); - VehicleAuditE build = VehicleAuditE.builder() - .vehicleApplyId(examTypeE.getId()).batchState(1).batchType(1) - .auditUserId(examTypeE.getAuditUserId()) - .auditUserName(examTypeE.getAuditUserName()) - .auditDeptId(examTypeE.getAuditDeptId()).auditDeptName(examTypeE.getAuditDeptName()). - auditCorpId(examTypeE.getAuditCorpId()).auditCorpName(examTypeE.getAuditCorpName()) - .auditStatus(AuditEnum.WAITING.getCode()).changeAfter(JSON.toJSONString(examTypeE)).build(); + VehicleApplyE add = vehicleApplyGateway.add(examTypeE); + VehicleAuditE build = VehicleAuditE.builder().vehicleApplyId(examTypeE.getId()).batchState(1).batchType(1).auditUserId(examTypeE.getAuditUserId()).auditUserName(examTypeE.getAuditUserName()).auditDeptId(examTypeE.getAuditDeptId()).auditDeptName(examTypeE.getAuditDeptName()).auditCorpId(examTypeE.getAuditCorpId()).auditCorpName(examTypeE.getAuditCorpName()).auditStatus(AuditEnum.WAITING.getCode()).changeAfter(JSON.toJSONString(examTypeE)).build(); // 添加审批信息 vehicleAuditGateway.add(build); // 发送待审核消息 todoListEventPusherUtil.sendMessageAddEvent(build.getSendEventObj()); - return true; + return add; } } diff --git a/web-app/src/main/java/com/zcloud/primeport/command/query/VehicleApplyQueryExe.java b/web-app/src/main/java/com/zcloud/primeport/command/query/VehicleApplyQueryExe.java index df52413..bf809db 100644 --- a/web-app/src/main/java/com/zcloud/primeport/command/query/VehicleApplyQueryExe.java +++ b/web-app/src/main/java/com/zcloud/primeport/command/query/VehicleApplyQueryExe.java @@ -61,6 +61,7 @@ public class VehicleApplyQueryExe { vehicleAuditLogs.add(vehicleAuditLog); }); VehicleApplyCO vehicleApplyCO = vehicleApplyCoConvertor.converDOToCO(vehicleApplyDO); + vehicleApplyCO.setReasonVisit(vehicleApplyCO.getRemarks()); vehicleApplyCO.setVehicleAuditLogList(vehicleAuditLogs); if (!list.isEmpty()) { VehicleAuditDO vehicleAuditDO = list.get(0); diff --git a/web-app/src/main/java/com/zcloud/primeport/service/VehicleApplyServiceImpl.java b/web-app/src/main/java/com/zcloud/primeport/service/VehicleApplyServiceImpl.java index f25a257..f8896bd 100644 --- a/web-app/src/main/java/com/zcloud/primeport/service/VehicleApplyServiceImpl.java +++ b/web-app/src/main/java/com/zcloud/primeport/service/VehicleApplyServiceImpl.java @@ -10,6 +10,7 @@ import com.zcloud.primeport.command.VehicleApplyRemoveExe; import com.zcloud.primeport.command.VehicleApplyUpdateExe; import com.zcloud.primeport.command.query.VehicleApplyQueryExe; import com.zcloud.primeport.domain.enums.AuditEnum; +import com.zcloud.primeport.domain.model.VehicleApplyE; import com.zcloud.primeport.dto.*; import com.zcloud.primeport.dto.clientobject.FgsVehicleCountCo; import com.zcloud.primeport.dto.clientobject.VehicleApplyCO; @@ -47,9 +48,8 @@ public class VehicleApplyServiceImpl implements VehicleApplyServiceI { @Override public SingleResponse add(VehicleApplyAddCmd cmd) { - - vehicleApplyAddExe.execute(cmd); - return SingleResponse.buildSuccess(); + VehicleApplyE execute = vehicleApplyAddExe.execute(cmd); + return SingleResponse.of(execute); } @Override diff --git a/web-client/src/main/java/com/zcloud/primeport/dto/VehicleAuditPageQry.java b/web-client/src/main/java/com/zcloud/primeport/dto/VehicleAuditPageQry.java index 541b6c2..c003cf8 100644 --- a/web-client/src/main/java/com/zcloud/primeport/dto/VehicleAuditPageQry.java +++ b/web-client/src/main/java/com/zcloud/primeport/dto/VehicleAuditPageQry.java @@ -50,5 +50,9 @@ public class VehicleAuditPageQry extends PageQuery { @ApiModelProperty(name = "vehicleApplyId", value = "车辆申请ID（车辆审批记录用）") private Long vehicleApplyId; + + + @ApiModelProperty(name = "h5UserIdCard", value = "H5查询用，申请的临时车辆驾驶人的身份证，车辆申请记录") + private String h5UserIdCard; } 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 8b52699..a0a1f08 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 @@ -98,6 +98,8 @@ public class VehicleApplyCO extends ClientObject { private String projectName; @ApiModelProperty(value = "名称,来访事由") private String remarks; + @ApiModelProperty(value = "来访事由") + private String reasonVisit; @ApiModelProperty(value = "口门id", name = "mkmjId") private Long mkmjId; @ApiModelProperty(value = "口门名称", name = "mkmjName") diff --git a/web-client/src/main/java/com/zcloud/primeport/dto/clientobject/VehicleAuditCO.java b/web-client/src/main/java/com/zcloud/primeport/dto/clientobject/VehicleAuditCO.java index 250b1f7..3632bd6 100644 --- a/web-client/src/main/java/com/zcloud/primeport/dto/clientobject/VehicleAuditCO.java +++ b/web-client/src/main/java/com/zcloud/primeport/dto/clientobject/VehicleAuditCO.java @@ -104,6 +104,16 @@ public class VehicleAuditCO extends ClientObject { private String projectName; @ApiModelProperty(value = "项目id", name = "projectId") private Long projectId; + @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; + @ApiModelProperty(value = "来访事由", name = "reasonVisit") + private String reasonVisit; @ApiModelProperty(value = "当前用户是否能审核。1，能审核2不能审核", name = "currentUserCanAudit") private Integer currentUserCanAudit; diff --git a/web-domain/src/main/java/com/zcloud/primeport/domain/gateway/VehicleApplyGateway.java b/web-domain/src/main/java/com/zcloud/primeport/domain/gateway/VehicleApplyGateway.java index 7bab8d6..8e03e48 100644 --- a/web-domain/src/main/java/com/zcloud/primeport/domain/gateway/VehicleApplyGateway.java +++ b/web-domain/src/main/java/com/zcloud/primeport/domain/gateway/VehicleApplyGateway.java @@ -15,7 +15,7 @@ public interface VehicleApplyGateway { /** * 新增 */ - Boolean add(VehicleApplyE vehicleApplyE); + VehicleApplyE add(VehicleApplyE vehicleApplyE); /** * 修改 diff --git a/web-infrastructure/src/main/java/com/zcloud/primeport/gatewayimpl/VehicleApplyGatewayImpl.java b/web-infrastructure/src/main/java/com/zcloud/primeport/gatewayimpl/VehicleApplyGatewayImpl.java index 2f4f20b..26e8b36 100644 --- a/web-infrastructure/src/main/java/com/zcloud/primeport/gatewayimpl/VehicleApplyGatewayImpl.java +++ b/web-infrastructure/src/main/java/com/zcloud/primeport/gatewayimpl/VehicleApplyGatewayImpl.java @@ -29,12 +29,12 @@ public class VehicleApplyGatewayImpl implements VehicleApplyGateway { private final VehicleAuditRepository VehicleAuditRepository; @Override - public Boolean add(VehicleApplyE vehicleApplyE) { + public VehicleApplyE add(VehicleApplyE vehicleApplyE) { VehicleApplyDO d = new VehicleApplyDO(); BeanUtils.copyProperties(vehicleApplyE, d); vehicleApplyRepository.save(d); vehicleApplyE.setId(d.getId()); - return true; + return vehicleApplyE; } @Override diff --git a/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/dataobject/VehicleApplyDO.java b/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/dataobject/VehicleApplyDO.java index afd850f..7ec5985 100644 --- a/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/dataobject/VehicleApplyDO.java +++ b/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/dataobject/VehicleApplyDO.java @@ -103,6 +103,12 @@ public class VehicleApplyDO extends BaseDO { @ApiModelProperty(value = "项目人员数") private Integer personApplyCount; + private Long mkmjId; + @TableField(exist = false) + private Long mkmjName; + + private String lsUserPhone; + private String lsUserIdcard; @ApiModelProperty(value = "审核企业") @TableField(exist = false) diff --git a/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/dataobject/VehicleAuditDO.java b/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/dataobject/VehicleAuditDO.java index 59f129d..78996eb 100644 --- a/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/dataobject/VehicleAuditDO.java +++ b/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/dataobject/VehicleAuditDO.java @@ -124,5 +124,12 @@ public class VehicleAuditDO extends BaseDO { @TableField(exist = false) private String gateLevelAuthArea; + @TableField(exist = false) + private String lsUserPhone; + @TableField(exist = false) + private String lsUserIdcard; + @TableField(exist = false) + private String reasonVisit; + } diff --git a/web-infrastructure/src/main/resources/mapper/VehicleAuditDO.xml b/web-infrastructure/src/main/resources/mapper/VehicleAuditDO.xml index 885b939..1959e11 100644 --- a/web-infrastructure/src/main/resources/mapper/VehicleAuditDO.xml +++ b/web-infrastructure/src/main/resources/mapper/VehicleAuditDO.xml @@ -45,7 +45,8 @@ va.ls_user_phone, va.ls_user_idcard, va.mkmj_id, - va.blocked_flag + va.blocked_flag, + va.remarks reason_visit FROM vehicle_audit AS a LEFT JOIN vehicle_apply AS va ON a.vehicle_apply_id = va.id