From b5a5405836897b8fed14b4c9e20f310e04324859 Mon Sep 17 00:00:00 2001 From: guoyuepeng <770272267@qq.com> Date: Tue, 18 Nov 2025 17:07:31 +0800 Subject: [PATCH] =?UTF-8?q?1.=E5=8F=A3=E9=97=A8=E9=97=A8=E7=A6=81-?= =?UTF-8?q?=E5=AE=A1=E6=89=B9=E6=B5=81=E7=A8=8B=E7=94=B3=E8=AF=B71?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../command/VehicleMessageAddExe.java | 15 ++++++++--- .../primeport/dto/VehicleAuditLogAddCmd.java | 2 +- .../dto/VehicleAuditLogUpdateCmd.java | 2 +- .../dto/VehicleMessageForCorpAddCmd.java | 19 ++++++++------ .../dto/clientobject/VehicleAuditLogCO.java | 2 +- .../gateway/VehicleAuditLogGateway.java | 3 --- .../domain/gateway/VehicleMessageGateway.java | 4 ++- .../domain/model/VehicleAuditLogE.java | 26 ++++++++++++++++++- .../domain/model/VehicleMessageE.java | 1 + .../VehicleMessageGatewayImpl.java | 11 +++----- .../dataobject/VehicleAuditLogDO.java | 2 +- 11 files changed, 60 insertions(+), 27 deletions(-) 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 c7ecfb0..9e9e52a 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 @@ -1,7 +1,10 @@ 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.VehicleMessageAddCmd; import com.zcloud.primeport.dto.VehicleMessageForCorpAddCmd; @@ -22,14 +25,14 @@ import org.springframework.transaction.annotation.Transactional; @AllArgsConstructor public class VehicleMessageAddExe { private final VehicleMessageGateway vehicleMessageGateway; - + private final VehicleAuditLogGateway vehicleAuditLogGateway; @Transactional(rollbackFor = Exception.class) public boolean execute(VehicleMessageAddCmd cmd) { VehicleMessageE examTypeE = new VehicleMessageE(); BeanUtils.copyProperties(cmd, examTypeE); boolean res = false; try { - res = vehicleMessageGateway.add(examTypeE); + VehicleMessageE add = vehicleMessageGateway.add(examTypeE); } catch (Exception e) { throw new RuntimeException(e); } @@ -46,7 +49,13 @@ public class VehicleMessageAddExe { examTypeE = examTypeE.VehicleMessageForCorpE(examTypeE); boolean res = false; try { - res = vehicleMessageGateway.add(examTypeE); + VehicleMessageE add = vehicleMessageGateway.add(examTypeE); + if (!Tools.isEmpty(cmd.getApprovalUserId())){ + VehicleAuditLogE vehicleAuditLogE = new VehicleAuditLogE(); + BeanUtils.copyProperties(cmd, vehicleAuditLogE); + vehicleAuditLogE.addFroVehicleLog(vehicleAuditLogE,add.getId()); // 添加审批信息 + res = vehicleAuditLogGateway.add(vehicleAuditLogE); // 添加审批信息 + } } catch (Exception e) { throw new RuntimeException(e); } 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 3c6b6f9..6d26a06 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 @@ -27,7 +27,7 @@ public class VehicleAuditLogAddCmd extends Command { private String vehicleAuditLogId; @ApiModelProperty(value = "审批批次(审批全流程,一次申请一次id)", name = "batchId", required = true) @NotEmpty(message = "审批批次(审批全流程,一次申请一次id)不能为空") - private Long batchId; + private String batchId; @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/VehicleAuditLogUpdateCmd.java b/web-client/src/main/java/com/zcloud/primeport/dto/VehicleAuditLogUpdateCmd.java index aea764d..92722c2 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 @@ -30,7 +30,7 @@ public class VehicleAuditLogUpdateCmd extends Command { private String vehicleAuditLogId; @ApiModelProperty(value = "审批批次(审批全流程,一次申请一次id)", name = "batchId", required = true) @NotEmpty(message = "审批批次(审批全流程,一次申请一次id)不能为空") - private Long batchId; + private String batchId; @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/VehicleMessageForCorpAddCmd.java b/web-client/src/main/java/com/zcloud/primeport/dto/VehicleMessageForCorpAddCmd.java index 06addd8..a42c5a7 100644 --- a/web-client/src/main/java/com/zcloud/primeport/dto/VehicleMessageForCorpAddCmd.java +++ b/web-client/src/main/java/com/zcloud/primeport/dto/VehicleMessageForCorpAddCmd.java @@ -9,6 +9,7 @@ import lombok.EqualsAndHashCode; import lombok.NoArgsConstructor; import javax.validation.constraints.NotEmpty; +import javax.validation.constraints.NotNull; /** * web-client @@ -23,7 +24,7 @@ import javax.validation.constraints.NotEmpty; public class VehicleMessageForCorpAddCmd extends Command { @ApiModelProperty(value = "车牌类型 0-白牌 1- 蓝牌 2-黄牌 3-绿牌 4-黑牌", name = "licenceType", required = true) - @NotEmpty(message = "车牌类型 0-白牌 1- 蓝牌 2-黄牌 3-绿牌 4-黑牌不能为空") + @NotNull(message = "车牌类型 0-白牌 1- 蓝牌 2-黄牌 3-绿牌 4-黑牌不能为空") private Integer licenceType; @ApiModelProperty(value = "车牌号", name = "licenceNo", required = true) @@ -35,15 +36,15 @@ public class VehicleMessageForCorpAddCmd extends Command { private String vehicleType; @ApiModelProperty(value = "车辆所属类型 0-员工车辆 1- 单位车辆 2-外部车辆3：货运车辆", name = "vehicleBelongType", required = true) - @NotEmpty(message = "车辆所属类型 0-员工车辆 1- 单位车辆 2-外部车辆3：货运车辆不能为空") + @NotNull(message = "车辆所属类型 0-员工车辆 1- 单位车辆 2-外部车辆3：货运车辆不能为空") private Integer vehicleBelongType; @ApiModelProperty(value = "通行港区(0-全部 1-东港区 2-西港区)", name = "portId", required = true) - @NotEmpty(message = "通行港区(0-全部 1-东港区 2-西港区)不能为空") + @NotNull(message = "通行港区(0-全部 1-东港区 2-西港区)不能为空") private Integer portId; @ApiModelProperty(value = "车辆所属部门id", name = "vehicleDepartmentId", required = true) - @NotEmpty(message = "车辆所属部门id不能为空") + @NotNull(message = "车辆所属部门id不能为空") private Long vehicleDepartmentId; @ApiModelProperty(value = "车辆所属部门名称", name = "vehicleDepartmentName", required = true) @NotEmpty(message = "车辆所属部门名称不能为空") @@ -55,22 +56,24 @@ public class VehicleMessageForCorpAddCmd extends Command { // @NotEmpty(message = "车辆所属人姓名(员工车辆)不能为空") private String employeeVehicleUserName; @ApiModelProperty(value = "企业ID", name = "corpinfoId", required = true) -// @NotEmpty(message = "企业ID不能为空") +// @NotNull(message = "企业ID不能为空") private Long corpId; @ApiModelProperty(value = "附件地址", name = "attachmentUrl", required = true) private String attachmentUrl; - + /** + * 审批信息 + */ @ApiModelProperty(value = "审核人ID", name = "approvalUserId") public Long approvalUserId; @ApiModelProperty(value = "审核人名字", name = "approvalUserName") - public Long approvalUserName; + public String approvalUserName; @ApiModelProperty(value = "审核人部门ID", name = "approvalDeptId") public Long approvalDeptId; @ApiModelProperty(value = "审核人部门名字", name = "approvalDeptName") - public Long 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 a87c908..aa97745 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 @@ -20,7 +20,7 @@ public class VehicleAuditLogCO extends ClientObject { private String vehicleAuditLogId; //审批批次(审批全流程,一次申请一次id) @ApiModelProperty(value = "审批批次(审批全流程,一次申请一次id)") - private Long batchId; + private String batchId; //车辆id @ApiModelProperty(value = "车辆id") private Long vehicleMessageId; diff --git a/web-domain/src/main/java/com/zcloud/primeport/domain/gateway/VehicleAuditLogGateway.java b/web-domain/src/main/java/com/zcloud/primeport/domain/gateway/VehicleAuditLogGateway.java index 362b838..8ebeb94 100644 --- a/web-domain/src/main/java/com/zcloud/primeport/domain/gateway/VehicleAuditLogGateway.java +++ b/web-domain/src/main/java/com/zcloud/primeport/domain/gateway/VehicleAuditLogGateway.java @@ -1,8 +1,5 @@ package com.zcloud.primeport.domain.gateway; - - import com.zcloud.primeport.domain.model.VehicleAuditLogE; - /** * web-domain * 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 ea1aa17..8e835e5 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 @@ -12,7 +12,7 @@ public interface VehicleMessageGateway { /** * 新增 */ - Boolean add(VehicleMessageE vehicleMessageE) ; + VehicleMessageE add(VehicleMessageE vehicleMessageE) ; /** * 修改 @@ -24,5 +24,7 @@ public interface VehicleMessageGateway { */ Boolean deletedVehicleMessageById(Long id); Boolean deletedVehicleMessageByIds(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 d3ce653..b1f91b3 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 @@ -3,6 +3,8 @@ package com.zcloud.primeport.domain.model; import com.alibaba.cola.domain.Entity; import com.jjb.saas.framework.domain.model.BaseE; +import com.zcloud.gbscommon.utils.Tools; +import io.swagger.annotations.ApiModelProperty; import lombok.Data; import lombok.EqualsAndHashCode; @@ -21,7 +23,7 @@ public class VehicleAuditLogE extends BaseE { //业务id private String vehicleAuditLogId; //审批批次(审批全流程,一次申请一次id) - private Long batchId; + private String batchId; //车辆id private Long vehicleMessageId; //审批人id @@ -38,6 +40,28 @@ public class VehicleAuditLogE extends BaseE { private Integer status; //审批状态(0正常,1.废除) private Integer stepType; + /** + * + */ + public Long approvalUserId; + public String approvalUserName; + public Long approvalDeptId; + public String approvalDeptName; + /** 监管端申请 + * 申请车辆的时候,审批信息. + * @param examTypeE + */ + public void addFroVehicleLog ( VehicleAuditLogE examTypeE,Long vehicleMessageId) { + userId = approvalUserId; + userName = approvalUserName; + deptId = approvalDeptId; + this.deptName = approvalDeptName; + this.batchId = "1"; + this.vehicleMessageId = vehicleMessageId; + this.status = 1; + stepType = 0; + 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 027cd11..984a1a3 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 @@ -4,6 +4,7 @@ package com.zcloud.primeport.domain.model; import com.jjb.saas.framework.domain.model.BaseE; import com.zcloud.gbscommon.utils.DateUtil; import com.zcloud.gbscommon.utils.Tools; +import io.swagger.annotations.ApiModelProperty; import lombok.Data; import javax.tools.Tool; 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 754cb91..159f09b 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 @@ -22,11 +22,12 @@ public class VehicleMessageGatewayImpl implements VehicleMessageGateway { private final VehicleMessageRepository vehicleMessageRepository; @Override - public Boolean add(VehicleMessageE vehicleMessageE) { + public VehicleMessageE add(VehicleMessageE vehicleMessageE) { VehicleMessageDO d = new VehicleMessageDO(); BeanUtils.copyProperties(vehicleMessageE, d); vehicleMessageRepository.save(d); - return true; + BeanUtils.copyProperties( d,vehicleMessageE); + return vehicleMessageE; } @Override @@ -39,11 +40,7 @@ public class VehicleMessageGatewayImpl implements VehicleMessageGateway { @Override public Boolean deletedVehicleMessageById(Long id) { - VehicleMessageDO d = new VehicleMessageDO(); - d.setId( id); - d.setDeleteEnum("TRUE"); - vehicleMessageRepository.updateById(d); - return true; + return vehicleMessageRepository.removeById(id); } @Override 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 c53dc52..2f9bf70 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 @@ -28,7 +28,7 @@ public class VehicleAuditLogDO extends BaseDO { private String vehicleAuditLogId; //审批批次(审批全流程,一次申请一次id) @ApiModelProperty(value = "审批批次(审批全流程,一次申请一次id)") - private Long batchId; + private String batchId; //车辆id @ApiModelProperty(value = "车辆id") private Long vehicleMessageId;