From b971c628e2c01ff5648665da30b7c38d14cf9642 Mon Sep 17 00:00:00 2001 From: dearLin <1261008090@qq.com> Date: Tue, 17 Mar 2026 14:39:33 +0800 Subject: [PATCH] =?UTF-8?q?feat=EF=BC=9A=E5=AE=A1=E6=89=B9=E6=97=B6?= =?UTF-8?q?=E9=97=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../primeport/command/VehicleApplyAddExe.java | 2 +- .../command/VehicleApplyUpdateExe.java | 2 +- .../service/VehicleApplyServiceImpl.java | 2 +- .../primeport/dto/VehicleApplyUpdateCmd.java | 56 +++++++++---------- .../dto/clientobject/VehicleAuditCO.java | 3 +- .../primeport/domain/model/VehicleApplyE.java | 4 -- .../dataobject/VehicleApplyDO.java | 3 - .../dataobject/VehicleAuditDO.java | 4 +- .../mapper/VehicleAuditMapper.java | 3 +- .../impl/VehicleAuditRepositoryImpl.java | 8 +-- .../main/resources/mapper/VehicleAuditDO.xml | 34 +++++++++++ 11 files changed, 75 insertions(+), 46 deletions(-) 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 bb43065..01b709e 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 @@ -45,7 +45,7 @@ public class VehicleApplyAddExe { examTypeE.setStatusFlag(2); examTypeE.setBlockedFlag(2); examTypeE.setAuditFlag(AuditEnum.WAITING.getCode()); - examTypeE.setApplyTime(DateUtil.date2Str(new Date())); +// examTypeE.setApplyTime(DateUtil.date2Str(new Date())); // 股份、分公司个人车辆 if (cmd.getVehicleBelongType().equals(VehicleBelongTypeEnum.JGD_PRI_VEHICLES.getCode()) || cmd.getVehicleBelongType().equals(VehicleBelongTypeEnum.FGS_PRI_VEHICLES.getCode())) { diff --git a/web-app/src/main/java/com/zcloud/primeport/command/VehicleApplyUpdateExe.java b/web-app/src/main/java/com/zcloud/primeport/command/VehicleApplyUpdateExe.java index 99287f0..d88f947 100644 --- a/web-app/src/main/java/com/zcloud/primeport/command/VehicleApplyUpdateExe.java +++ b/web-app/src/main/java/com/zcloud/primeport/command/VehicleApplyUpdateExe.java @@ -38,7 +38,7 @@ public class VehicleApplyUpdateExe { VehicleApplyE oldV = vehicleApplyGateway.getById(vehicleApplyE.getId()); BeanUtils.copyProperties(vehicleApplyUpdateCmd, vehicleApplyE); vehicleApplyE.setAuditFlag(AuditEnum.WAITING.getCode()); - vehicleApplyE.setApplyTime(DateUtil.date2Str(new Date())); +// vehicleApplyE.setApplyTime(DateUtil.date2Str(new Date())); boolean res = vehicleApplyGateway.update(vehicleApplyE); VehicleAuditE build = VehicleAuditE.builder().vehicleApplyId(vehicleApplyE.getId()).batchState(1).batchType(2).auditUserId(vehicleApplyE.getAuditUserId()).auditUserName(vehicleApplyE.getAuditUserName()).auditDeptId(vehicleApplyE.getAuditDeptId()).auditDeptName(vehicleApplyE.getAuditDeptName()).auditCorpId(vehicleApplyE.getAuditCorpId()).auditCorpName(vehicleApplyE.getAuditCorpName()).auditStatus(AuditEnum.WAITING.getCode()).changeAfter(JSON.toJSONString(oldV)).changeBefore(JSON.toJSONString(vehicleApplyE)).build(); // 添加审批信息 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 c84952f..f25a257 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 @@ -94,7 +94,7 @@ public class VehicleApplyServiceImpl implements VehicleApplyServiceI { vehicleApplyDO.setMkmjPermission(1); vehicleApplyDO.setRemarks(cmd.getRemarks()); vehicleApplyDO.setVehicleBelongType(cmd.getVehicleBelongType()); - vehicleApplyDO.setApplyTime(DateUtil.date2Str(new Date())); +// vehicleApplyDO.setApplyTime(DateUtil.date2Str(new Date())); BeanUtils.copyProperties(item, vehicleApplyDO); objects.add(vehicleApplyDO); }); diff --git a/web-client/src/main/java/com/zcloud/primeport/dto/VehicleApplyUpdateCmd.java b/web-client/src/main/java/com/zcloud/primeport/dto/VehicleApplyUpdateCmd.java index 72a6298..d6ea71d 100644 --- a/web-client/src/main/java/com/zcloud/primeport/dto/VehicleApplyUpdateCmd.java +++ b/web-client/src/main/java/com/zcloud/primeport/dto/VehicleApplyUpdateCmd.java @@ -22,78 +22,78 @@ import java.util.Date; @NoArgsConstructor @AllArgsConstructor public class VehicleApplyUpdateCmd extends Command { - @ApiModelProperty(value = "id", name = "id", required = true) + @ApiModelProperty(value = "id", name = "id") @NotNull(message = "id不能为空") private Long id; - @ApiModelProperty(value = "车牌类型数据字典", name = "licenceType", required = true) + @ApiModelProperty(value = "车牌类型数据字典", name = "licenceType") @NotEmpty(message = "车牌类型数据字典不能为空") private String licenceType; - @ApiModelProperty(value = "车牌类型名称0-白牌 1- 蓝牌 2-黄牌 3-绿牌 4-黑牌", name = "licenceTypeName", required = true) + @ApiModelProperty(value = "车牌类型名称0-白牌 1- 蓝牌 2-黄牌 3-绿牌 4-黑牌", name = "licenceTypeName") @NotEmpty(message = "车牌类型名称0-白牌 1- 蓝牌 2-黄牌 3-绿牌 4-黑牌不能为空") private String licenceTypeName; - @ApiModelProperty(value = "车辆类型", name = "vehicleType", required = true) + @ApiModelProperty(value = "车辆类型", name = "vehicleType") @NotEmpty(message = "车辆类型不能为空") private String vehicleType; - @ApiModelProperty(value = "车辆类型-名字", name = "vehicleTypeName", required = true) + @ApiModelProperty(value = "车辆类型-名字", name = "vehicleTypeName") @NotEmpty(message = "车辆类型-名字不能为空") private String vehicleTypeName; - @ApiModelProperty(value = "授权范围港区与区域", name = "gateLevelAuthArea", required = true) + @ApiModelProperty(value = "授权范围港区与区域", name = "gateLevelAuthArea") @NotEmpty(message = "授权范围港区与区域不能为空") private String gateLevelAuthArea; - @ApiModelProperty(value = "访问起始时间", name = "visitStartTime", required = true) + @ApiModelProperty(value = "访问起始时间", name = "visitStartTime") @NotNull(message = "访问起始时间不能为空") private String visitStartTime; - @ApiModelProperty(value = "访问结束时间", name = "visitEndTime", required = true) + @ApiModelProperty(value = "访问结束时间", name = "visitEndTime") @NotNull(message = "访问结束时间不能为空") private String visitEndTime; - @ApiModelProperty(value = "车辆所属企业ID", name = "vehicleCorpId", required = true) + @ApiModelProperty(value = "车辆所属企业ID", name = "vehicleCorpId") @NotNull(message = "车辆所属企业ID不能为空") private Long vehicleCorpId; - @ApiModelProperty(value = "车辆所属企业名称", name = "vehicleCorpName", required = true) + @ApiModelProperty(value = "车辆所属企业名称", name = "vehicleCorpName") @NotEmpty(message = "车辆所属企业名称不能为空") private String vehicleCorpName; - @ApiModelProperty(value = "车辆所属部门id", name = "vehicleDepartmentId", required = true) + @ApiModelProperty(value = "车辆所属部门id", name = "vehicleDepartmentId") @NotNull(message = "车辆所属部门id不能为空") private Long vehicleDepartmentId; - @ApiModelProperty(value = "车辆所属部门名称", name = "vehicleDepartmentName", required = true) + @ApiModelProperty(value = "车辆所属部门名称", name = "vehicleDepartmentName") @NotEmpty(message = "车辆所属部门名称不能为空") private String vehicleDepartmentName; - @ApiModelProperty(value = "车辆所属人id(员工车辆/驾驶人id)", name = "employeeVehicleUserId", required = true) + @ApiModelProperty(value = "车辆所属人id(员工车辆/驾驶人id)", name = "employeeVehicleUserId") @NotNull(message = "车辆所属人id(员工车辆/驾驶人id)不能为空") private Long employeeVehicleUserId; - @ApiModelProperty(value = "车辆所属人姓名(员工车辆/驾驶人名称)", name = "employeeVehicleUserName", required = true) + @ApiModelProperty(value = "车辆所属人姓名(员工车辆/驾驶人名称)", name = "employeeVehicleUserName") @NotEmpty(message = "车辆所属人姓名(员工车辆/驾驶人名称)不能为空") private String employeeVehicleUserName; - @ApiModelProperty(value = "排放标准名称", name = "emissionStandards", required = true) + @ApiModelProperty(value = "排放标准名称", name = "emissionStandards") private String emissionStandards; - @ApiModelProperty(value = "排放标准", name = "emissionStandardsName", required = true) + @ApiModelProperty(value = "排放标准", name = "emissionStandardsName") private String emissionStandardsName; - @ApiModelProperty(value = "行驶证照片", name = "drivingLicenseId", required = true) + @ApiModelProperty(value = "行驶证照片", name = "drivingLicenseId") @NotNull(message = "行驶证照片不能为空") private String drivingLicenseId; - @ApiModelProperty(value = "车辆照片", name = "attachmentId", required = true) + @ApiModelProperty(value = "车辆照片", name = "attachmentId") @NotNull(message = "车辆照片不能为空") private String attachmentId; - @ApiModelProperty(value = "告知签字", name = "informSignId", required = true) - @NotNull(message = "告知签字不能为空") + @ApiModelProperty(value = "告知签字", name = "informSignId") +// @NotNull(message = "告知签字不能为空") private String informSignId; - @ApiModelProperty(value = "项目id", name = "projectId", required = true) + @ApiModelProperty(value = "项目id", name = "projectId") private Long projectId; - @ApiModelProperty(value = "项目名称", name = "projectName", required = true) + @ApiModelProperty(value = "项目名称", name = "projectName") private String projectName; // 审批 - @ApiModelProperty(value = "审核企业", name = "auditCorpId", required = true) + @ApiModelProperty(value = "审核企业", name = "auditCorpId") private Long auditCorpId; - @ApiModelProperty(value = "审核企业名称", name = "auditCorpName", required = true) + @ApiModelProperty(value = "审核企业名称", name = "auditCorpName") private String auditCorpName; - @ApiModelProperty(value = "审核部门", name = "auditDeptId", required = true) + @ApiModelProperty(value = "审核部门", name = "auditDeptId") private Long auditDeptId; - @ApiModelProperty(value = "审核部门名称", name = "auditDeptName", required = true) + @ApiModelProperty(value = "审核部门名称", name = "auditDeptName") private String auditDeptName; - @ApiModelProperty(value = "审核用户", name = "auditUserId", required = true) + @ApiModelProperty(value = "审核用户", name = "auditUserId") private Long auditUserId; - @ApiModelProperty(value = "审核用户名称", name = "auditUserName", required = true) + @ApiModelProperty(value = "审核用户名称", name = "auditUserName") private String auditUserName; } 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 720b059..250b1f7 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 @@ -53,10 +53,11 @@ public class VehicleAuditCO extends ClientObject { //审批意见 @ApiModelProperty(value = "审批意见(驳回原因)", name = "remarks") private String remarks; - //访问起始时间 @ApiModelProperty(value = "访问起始时间", name = "visitStartTime") private String visitStartTime; + @ApiModelProperty(value = "申请时间", name = "applyTime") + private String applyTime; //访问结束时间 @ApiModelProperty(value = "访问结束时间", name = "visitEndTime") private String visitEndTime; 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 30f7f08..9c25a80 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 @@ -71,13 +71,9 @@ public class VehicleApplyE extends BaseE { private String projectName; //1被拉黑2未拉黑 private Integer blockedFlag; - private Long mkmjId; private String lsUserPhone; private String lsUserIdcard; - private String applyTime; - - private Long auditCorpId; private String auditCorpName; private Long auditDeptId; 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 33ab88e..afd850f 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 @@ -60,9 +60,6 @@ public class VehicleApplyDO extends BaseDO { //车辆所属企业ID @ApiModelProperty(value = "车辆所属企业ID") private Long vehicleCorpId; - @ApiModelProperty(value = "申请时间") - private String applyTime; - //车辆所属企业名称 @ApiModelProperty(value = "车辆所属企业名称") private String vehicleCorpName; 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 636db83..59f129d 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 @@ -60,7 +60,9 @@ public class VehicleAuditDO extends BaseDO { //变更前信息 @ApiModelProperty(value = "变更前信息") private String changeBefore; - + @ApiModelProperty(value = "申请时间") + @TableField(exist = false) + private String applyTime; //访问起始时间 @ApiModelProperty(value = "访问起始时间") @TableField(exist = false) diff --git a/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/mapper/VehicleAuditMapper.java b/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/mapper/VehicleAuditMapper.java index af2da3e..666dc2d 100644 --- a/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/mapper/VehicleAuditMapper.java +++ b/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/mapper/VehicleAuditMapper.java @@ -23,5 +23,6 @@ import java.util.Map; public interface VehicleAuditMapper extends BaseMapper { IPage listPage(Page> page, Map parmas, String menuPerms); -} + IPage carApprovalLogByvehicleApplyIdList(Page> page, Map parmas); +} \ No newline at end of file diff --git a/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/repository/impl/VehicleAuditRepositoryImpl.java b/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/repository/impl/VehicleAuditRepositoryImpl.java index 5fc5bd0..6f14422 100644 --- a/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/repository/impl/VehicleAuditRepositoryImpl.java +++ b/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/repository/impl/VehicleAuditRepositoryImpl.java @@ -50,11 +50,9 @@ public class VehicleAuditRepositoryImpl extends BaseRepositoryImpl carApprovalLogByvehicleApplyIdList(Map parmas) { - IPage iPage = new Query().getPage(parmas); - QueryWrapper queryWrapper = new QueryWrapper<>(); - queryWrapper.eq("vehicle_apply_id", parmas.get("vehicleApplyId")); - queryWrapper.orderByDesc("create_time"); - IPage result = vehicleAuditMapper.selectPage(iPage, queryWrapper); + Page> page = new Page<>(Integer.parseInt(parmas.get("pageIndex").toString()), + Integer.parseInt(parmas.get("pageSize").toString())); + IPage result = vehicleAuditMapper.carApprovalLogByvehicleApplyIdList(page, parmas); return PageHelper.pageToResponse(result, result.getRecords()); } diff --git a/web-infrastructure/src/main/resources/mapper/VehicleAuditDO.xml b/web-infrastructure/src/main/resources/mapper/VehicleAuditDO.xml index 7f8cb9d..a5394ca 100644 --- a/web-infrastructure/src/main/resources/mapper/VehicleAuditDO.xml +++ b/web-infrastructure/src/main/resources/mapper/VehicleAuditDO.xml @@ -96,5 +96,39 @@ ) +