feat：临时申请补充驾驶人

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<VehicleAuditDO> objectQueryWrapper = new QueryWrapper<>();
         objectQueryWrapper.eq("vehicle_apply_id", id);
         objectQueryWrapper.orderByDesc("id");

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;
+
+
 }
 

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;
 

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;
     //告知签字

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;

web-infrastructure/src/main/java/com/zcloud/primeport/persistence/mapper/VehicleApplyMapper.java

@@ -23,5 +23,7 @@ public interface VehicleApplyMapper extends BaseMapper<VehicleApplyDO> {
     IPage<VehicleApplyDO> listPage(Page<Map<String, Object>> page, @Param("params") Map<String, Object> params, String menuPerms);
 
     IPage<FgsVehicleCountDto> fgsCount(Page<Map<String, Object>> page, HashMap<String, String> qry);
+
+    VehicleApplyDO getInfoById(Long id);
 }
 

web-infrastructure/src/main/java/com/zcloud/primeport/persistence/repository/VehicleApplyRepository.java

@@ -20,5 +20,7 @@ public interface VehicleApplyRepository extends BaseRepository<VehicleApplyDO> {
     PageResponse<FgsVehicleCountDto> fgsCount(HashMap<String, String> qry);
 
     PageResponse<VehicleApplyDO> getCarByVehicleBelongType(Map<String, Object> params);
+
+    VehicleApplyDO getInfoById(Long id);
 }
 

web-infrastructure/src/main/java/com/zcloud/primeport/persistence/repository/impl/VehicleApplyRepositoryImpl.java

@@ -76,5 +76,10 @@ public class VehicleApplyRepositoryImpl extends BaseRepositoryImpl<VehicleApplyM
         IPage<VehicleApplyDO> result = vehicleApplyMapper.selectPage(iPage, queryWrapper);
        return PageHelper.pageToResponse(result, result.getRecords());
     }
+
+    @Override
+    public VehicleApplyDO getInfoById(Long id) {
+        return vehicleApplyMapper.getInfoById(id);
+    }
 }
 

web-infrastructure/src/main/resources/mapper/VehicleApplyDO.xml

@@ -132,5 +132,14 @@
             c.corp_order,
             c.create_time DESC
     </select>
+    <select id="getInfoById" resultType="com.zcloud.primeport.persistence.dataobject.VehicleApplyDO">
+        SELECT
+            va.*,
+            m.mkmj_name
+        FROM
+            vehicle_apply va
+                LEFT JOIN mkmj m on va.mkmj_id = m.id
+        WHERE va.id = #{id}
+    </select>
 </mapper>