From af163bb0e73d126e4551a27791e6cad3707333bd Mon Sep 17 00:00:00 2001 From: dearLin <1261008090@qq.com> Date: Tue, 24 Mar 2026 17:53:48 +0800 Subject: [PATCH] =?UTF-8?q?feat=EF=BC=9A=E4=B8=B4=E6=97=B6=E7=94=B3?= =?UTF-8?q?=E8=AF=B7=E8=A1=A5=E5=85=85=E9=A9=BE=E9=A9=B6=E4=BA=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../primeport/command/query/VehicleApplyQueryExe.java | 2 +- .../com/zcloud/primeport/dto/ClosedTmpApplyAddCmd.java | 6 ++++++ .../com/zcloud/primeport/dto/VehicleApplyAddCmd.java | 2 ++ .../com/zcloud/primeport/domain/model/VehicleApplyE.java | 1 + .../primeport/persistence/dataobject/VehicleApplyDO.java | 2 +- .../primeport/persistence/mapper/VehicleApplyMapper.java | 2 ++ .../persistence/repository/VehicleApplyRepository.java | 2 ++ .../repository/impl/VehicleApplyRepositoryImpl.java | 5 +++++ .../src/main/resources/mapper/VehicleApplyDO.xml | 9 +++++++++ 9 files changed, 29 insertions(+), 2 deletions(-) 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 62ac024..cecd97c 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 @@ -49,7 +49,7 @@ public class VehicleApplyQueryExe { } public VehicleApplyCO getInfoById(Long id) { - VehicleApplyDO vehicleApplyDO = vehicleApplyRepository.getById(id); + VehicleApplyDO vehicleApplyDO = vehicleApplyRepository.getInfoById(id); QueryWrapper objectQueryWrapper = new QueryWrapper<>(); objectQueryWrapper.eq("vehicle_apply_id", id); objectQueryWrapper.orderByDesc("id"); diff --git a/web-client/src/main/java/com/zcloud/primeport/dto/ClosedTmpApplyAddCmd.java b/web-client/src/main/java/com/zcloud/primeport/dto/ClosedTmpApplyAddCmd.java index 0af626a..113d54f 100644 --- a/web-client/src/main/java/com/zcloud/primeport/dto/ClosedTmpApplyAddCmd.java +++ b/web-client/src/main/java/com/zcloud/primeport/dto/ClosedTmpApplyAddCmd.java @@ -125,5 +125,11 @@ public class ClosedTmpApplyAddCmd extends Command { @ApiModelProperty(value = "车辆照片", name = "attachmentId", required = true) private String attachmentId; + @ApiModelProperty(value = "驾驶人ID", name = "drivingUserId", required = true) + private String drivingUserId; + @ApiModelProperty(value = "驾驶人名称", name = "drivingUserName", required = true) + private String drivingUserName; + + } 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 0c5165e..be74b52 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 @@ -73,6 +73,8 @@ public class VehicleApplyAddCmd extends Command { private String lsUserPhone; @ApiModelProperty(value = "临时申请驾驶人身份证", name = "lsUserIdcard") private String lsUserIdcard; + @ApiModelProperty(value = "临时申请驾驶人姓名", name = "lsUserIdcard") + private String drivingUserName; @ApiModelProperty(value = "来访事由", name = "remarks") private String remarks; diff --git a/web-domain/src/main/java/com/zcloud/primeport/domain/model/VehicleApplyE.java b/web-domain/src/main/java/com/zcloud/primeport/domain/model/VehicleApplyE.java index 9c25a80..3105760 100644 --- a/web-domain/src/main/java/com/zcloud/primeport/domain/model/VehicleApplyE.java +++ b/web-domain/src/main/java/com/zcloud/primeport/domain/model/VehicleApplyE.java @@ -61,6 +61,7 @@ public class VehicleApplyE extends BaseE { private String emissionStandardsName; //行驶证照片 private String drivingLicenseId; + private String drivingUserName; //车辆照片 private String attachmentId; //告知签字 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 7ec5985..92d44cd 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 @@ -109,7 +109,7 @@ public class VehicleApplyDO extends BaseDO { private String lsUserPhone; private String lsUserIdcard; - + private String drivingUserName; @ApiModelProperty(value = "审核企业") @TableField(exist = false) private Long auditCorpId; diff --git a/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/mapper/VehicleApplyMapper.java b/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/mapper/VehicleApplyMapper.java index ad56dd0..969fb95 100644 --- a/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/mapper/VehicleApplyMapper.java +++ b/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/mapper/VehicleApplyMapper.java @@ -23,5 +23,7 @@ public interface VehicleApplyMapper extends BaseMapper { IPage listPage(Page> page, @Param("params") Map params, String menuPerms); IPage fgsCount(Page> page, HashMap qry); + + VehicleApplyDO getInfoById(Long id); } diff --git a/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/repository/VehicleApplyRepository.java b/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/repository/VehicleApplyRepository.java index 15afacf..d6cd7b5 100644 --- a/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/repository/VehicleApplyRepository.java +++ b/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/repository/VehicleApplyRepository.java @@ -20,5 +20,7 @@ public interface VehicleApplyRepository extends BaseRepository { PageResponse fgsCount(HashMap qry); PageResponse getCarByVehicleBelongType(Map params); + + VehicleApplyDO getInfoById(Long id); } diff --git a/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/repository/impl/VehicleApplyRepositoryImpl.java b/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/repository/impl/VehicleApplyRepositoryImpl.java index 10182d9..bd35c38 100644 --- a/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/repository/impl/VehicleApplyRepositoryImpl.java +++ b/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/repository/impl/VehicleApplyRepositoryImpl.java @@ -76,5 +76,10 @@ public class VehicleApplyRepositoryImpl extends BaseRepositoryImpl result = vehicleApplyMapper.selectPage(iPage, queryWrapper); return PageHelper.pageToResponse(result, result.getRecords()); } + + @Override + public VehicleApplyDO getInfoById(Long id) { + return vehicleApplyMapper.getInfoById(id); + } } diff --git a/web-infrastructure/src/main/resources/mapper/VehicleApplyDO.xml b/web-infrastructure/src/main/resources/mapper/VehicleApplyDO.xml index cd6f7ca..f116c56 100644 --- a/web-infrastructure/src/main/resources/mapper/VehicleApplyDO.xml +++ b/web-infrastructure/src/main/resources/mapper/VehicleApplyDO.xml @@ -132,5 +132,14 @@ c.corp_order, c.create_time DESC +