From 3400867c7ba317a29a4bb84e897db2110009031e Mon Sep 17 00:00:00 2001 From: shenzhidan Date: Mon, 9 Mar 2026 09:58:14 +0800 Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E4=BF=AE=E6=94=B9=E5=AE=A1=E6=89=B9?= =?UTF-8?q?=E8=AE=B0=E5=BD=95=E7=8A=B6=E6=80=81=EF=BC=9A=E5=8E=BB=E6=8E=89?= =?UTF-8?q?=E5=BE=85=E5=AE=A1=E6=89=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../training/TrainingApplyProcessCO.java | 2 +- .../training/TrainingApplyRecordCO.java | 4 +- .../training/TrainingApplyRecordAddCmd.java | 3 +- .../training/TrainingApplyRecordPageQry.java | 2 +- .../TrainingApplyRecordUpdateCmd.java | 2 +- .../edu/domain/enums/ApprovalStatusEnum.java | 9 ++-- .../model/training/TrainingApplyProcessE.java | 51 ------------------- .../model/training/TrainingApplyRecordE.java | 11 ++-- .../dataobject/TrainingApplyRecordDO.java | 4 +- 9 files changed, 16 insertions(+), 72 deletions(-) diff --git a/web-client/src/main/java/com/zcloud/edu/dto/clientobject/training/TrainingApplyProcessCO.java b/web-client/src/main/java/com/zcloud/edu/dto/clientobject/training/TrainingApplyProcessCO.java index c907829..e19b7f8 100644 --- a/web-client/src/main/java/com/zcloud/edu/dto/clientobject/training/TrainingApplyProcessCO.java +++ b/web-client/src/main/java/com/zcloud/edu/dto/clientobject/training/TrainingApplyProcessCO.java @@ -28,7 +28,7 @@ public class TrainingApplyProcessCO extends ClientObject { @ApiModelProperty(value = "审批类型(1:发起,2:审批，3:委托)") private Long applyType; //记录审批状态 - @ApiModelProperty(value = "记录审批状态 审批状态1:待审批2:审批中,3:审批完成") + @ApiModelProperty(value = "记录审批状态 审批状态1:审批中,2:审批完成") private Long approvalStatus; //手机号 @ApiModelProperty(value = "手机号") diff --git a/web-client/src/main/java/com/zcloud/edu/dto/clientobject/training/TrainingApplyRecordCO.java b/web-client/src/main/java/com/zcloud/edu/dto/clientobject/training/TrainingApplyRecordCO.java index 4691c28..97062c4 100644 --- a/web-client/src/main/java/com/zcloud/edu/dto/clientobject/training/TrainingApplyRecordCO.java +++ b/web-client/src/main/java/com/zcloud/edu/dto/clientobject/training/TrainingApplyRecordCO.java @@ -56,8 +56,8 @@ public class TrainingApplyRecordCO extends ClientObject { // 关联项目 @ApiModelProperty(value = "关联项目") private String projectName; - //审批状态1:待审批2:审批中,3:审批完成 - @ApiModelProperty(value = "审批状态1:待审批2:审批中,3:审批完成") + //审批状态1:审批中,2:审批完成 + @ApiModelProperty(value = "审批状态1:审批中,2:审批完成") private Long approvalStatus; //乐观锁 @ApiModelProperty(value = "乐观锁") diff --git a/web-client/src/main/java/com/zcloud/edu/dto/training/TrainingApplyRecordAddCmd.java b/web-client/src/main/java/com/zcloud/edu/dto/training/TrainingApplyRecordAddCmd.java index a63798f..b0e21c6 100644 --- a/web-client/src/main/java/com/zcloud/edu/dto/training/TrainingApplyRecordAddCmd.java +++ b/web-client/src/main/java/com/zcloud/edu/dto/training/TrainingApplyRecordAddCmd.java @@ -53,8 +53,7 @@ public class TrainingApplyRecordAddCmd extends Command { @NotEmpty(message = "关联项目不能为空") private String projectName; - @ApiModelProperty(value = "审批状态1:待审批2:审批中,3:审批完成", name = "approvalStatus", required = true) -// @NotNull(message = "审批状态1:待审批2:审批中,3:审批完成不能为空") + @ApiModelProperty(value = "审批状态1:审批中,2:审批完成", name = "approvalStatus", required = true) private Long approvalStatus; @ApiModelProperty(value = "申请人员列表") diff --git a/web-client/src/main/java/com/zcloud/edu/dto/training/TrainingApplyRecordPageQry.java b/web-client/src/main/java/com/zcloud/edu/dto/training/TrainingApplyRecordPageQry.java index c3ba893..afb669d 100644 --- a/web-client/src/main/java/com/zcloud/edu/dto/training/TrainingApplyRecordPageQry.java +++ b/web-client/src/main/java/com/zcloud/edu/dto/training/TrainingApplyRecordPageQry.java @@ -26,7 +26,7 @@ public class TrainingApplyRecordPageQry extends PageQuery { */ private String likeTrainingApplyRecordId; - @ApiModelProperty(value = "审批状态1:待审批2:审批通过,3:审批完成", name = "approvalStatus", required = false) + @ApiModelProperty(value = "审批状态1:审批中,2:审批完成", name = "approvalStatus", required = false) private Long eqApprovalStatus; @ApiModelProperty(value = "审批人ID", name = "approvalUserId", required = false) diff --git a/web-client/src/main/java/com/zcloud/edu/dto/training/TrainingApplyRecordUpdateCmd.java b/web-client/src/main/java/com/zcloud/edu/dto/training/TrainingApplyRecordUpdateCmd.java index fee2aa2..8b4798c 100644 --- a/web-client/src/main/java/com/zcloud/edu/dto/training/TrainingApplyRecordUpdateCmd.java +++ b/web-client/src/main/java/com/zcloud/edu/dto/training/TrainingApplyRecordUpdateCmd.java @@ -39,7 +39,7 @@ public class TrainingApplyRecordUpdateCmd extends Command { private Long approvalUserId; @ApiModelProperty(value = "关联项目id", name = "projectName", required = true) private String projectName; - @ApiModelProperty(value = "审批状态1:待审批2:审批中,3:审批完成", name = "approvalStatus", required = true) + @ApiModelProperty(value = "审批状态1:审批中,2:审批完成", name = "approvalStatus", required = true) private Long approvalStatus; @ApiModelProperty(value = "申请用户") diff --git a/web-domain/src/main/java/com/zcloud/edu/domain/enums/ApprovalStatusEnum.java b/web-domain/src/main/java/com/zcloud/edu/domain/enums/ApprovalStatusEnum.java index 38c5c5c..1c8b4b2 100644 --- a/web-domain/src/main/java/com/zcloud/edu/domain/enums/ApprovalStatusEnum.java +++ b/web-domain/src/main/java/com/zcloud/edu/domain/enums/ApprovalStatusEnum.java @@ -11,14 +11,11 @@ import lombok.Getter; @AllArgsConstructor public enum ApprovalStatusEnum { - /** 待审批 */ - PENDING(1L, "待审批"), - /** 审批中 */ - APPROVING(2L, "审批中"), + APPROVING(1L, "审批中"), /** 审批完成 */ - APPROVED(3L, "审批完成"); + APPROVED(2L, "审批完成"); private final Long code; private final String desc; @@ -31,4 +28,4 @@ public enum ApprovalStatusEnum { } throw new BizException("未知的审批状态: " + code); } -} \ No newline at end of file +} diff --git a/web-domain/src/main/java/com/zcloud/edu/domain/model/training/TrainingApplyProcessE.java b/web-domain/src/main/java/com/zcloud/edu/domain/model/training/TrainingApplyProcessE.java index 7abedfb..09e189a 100644 --- a/web-domain/src/main/java/com/zcloud/edu/domain/model/training/TrainingApplyProcessE.java +++ b/web-domain/src/main/java/com/zcloud/edu/domain/model/training/TrainingApplyProcessE.java @@ -26,8 +26,6 @@ public class TrainingApplyProcessE extends BaseE { private Long departmentId; //用户id private Long userId; - // 流程审批状态 审批状态1:待审批2:审批中,3:审批完成 - private Long approvalStatus; /** * 创建发起流程 @@ -46,55 +44,6 @@ public class TrainingApplyProcessE extends BaseE { return process; } - /** - * 创建审批流程 - */ - public static TrainingApplyProcessE createApproval( - String recordId, Long corpinfoId, Long departmentId, Long userId, String remarks) { - - TrainingApplyProcessE process = new TrainingApplyProcessE(); - process.setTrainingApplyProcessId(IdUtil.simpleUUID()); - process.setTrainingApplyRecordId(recordId); - process.setApplyType(ApplyTypeEnum.APPROVAL.getCode()); - process.setCorpinfoId(corpinfoId); - process.setDepartmentId(departmentId); - process.setUserId(userId); - process.setRemarks(remarks); - return process; - } - - /** - * 创建委托流程 - */ - public static TrainingApplyProcessE createDelegate( - String recordId, Long corpinfoId, Long departmentId, Long userId, String remarks) { - - TrainingApplyProcessE process = new TrainingApplyProcessE(); - process.setTrainingApplyProcessId(IdUtil.simpleUUID()); - process.setTrainingApplyRecordId(recordId); - process.setApplyType(ApplyTypeEnum.DELEGATE.getCode()); - process.setCorpinfoId(corpinfoId); - process.setDepartmentId(departmentId); - process.setUserId(userId); - process.setRemarks(remarks); - return process; - } - - /** - * 设置审批状态 - */ - public void setApprovalStatus(Long approvalStatus) { - if (approvalStatus == null) return; - this.approvalStatus = approvalStatus; - } - - /** - * 判断是否需要设置审批状态 - */ - private boolean needApprovalStatus(Long applyType) { - return ApplyTypeEnum.APPROVAL.getCode().equals(applyType) - || ApplyTypeEnum.DELEGATE.getCode().equals(applyType); - } } diff --git a/web-domain/src/main/java/com/zcloud/edu/domain/model/training/TrainingApplyRecordE.java b/web-domain/src/main/java/com/zcloud/edu/domain/model/training/TrainingApplyRecordE.java index da6e76d..91b86a4 100644 --- a/web-domain/src/main/java/com/zcloud/edu/domain/model/training/TrainingApplyRecordE.java +++ b/web-domain/src/main/java/com/zcloud/edu/domain/model/training/TrainingApplyRecordE.java @@ -50,7 +50,7 @@ public class TrainingApplyRecordE extends BaseE { private String approvalUserName; //关联项目 private String projectName; - //审批状态:1待审批,2审批中,3审批完成 + //审批状态:1审批中,2审批完成 private Long approvalStatus; //申请人员列表 @@ -82,7 +82,7 @@ public class TrainingApplyRecordE extends BaseE { this.trainingApplyRecordId = StrUtil.isNotBlank(this.trainingApplyRecordId) ? this.trainingApplyRecordId : IdUtil.simpleUUID(); - this.approvalStatus = ApprovalStatusEnum.PENDING.getCode(); + this.approvalStatus = ApprovalStatusEnum.APPROVING.getCode(); // 初始化申请人员 if (!CollectionUtils.isEmpty(this.applyUsers)) { @@ -121,7 +121,7 @@ public class TrainingApplyRecordE extends BaseE { this.approvalCorpinfoId, this.approvalDepartmentId, this.approvalUserId, - "等待审批" + "审批中" ); this.processes.add(process); } @@ -131,9 +131,8 @@ public class TrainingApplyRecordE extends BaseE { */ public void approve(Long approvalStatus) { // 状态校验 - if (!ApprovalStatusEnum.PENDING.getCode().equals(approvalStatus) - && !ApprovalStatusEnum.APPROVING.getCode().equals(approvalStatus)) { - throw new BizException("只有待审批或审批中状态才能进行审批"); + if (!ApprovalStatusEnum.APPROVING.getCode().equals(approvalStatus)) { + throw new BizException("只有审批中状态才能进行审批"); } if (CollectionUtils.isEmpty(this.applyUsers)) { diff --git a/web-infrastructure/src/main/java/com/zcloud/edu/persistence/dataobject/TrainingApplyRecordDO.java b/web-infrastructure/src/main/java/com/zcloud/edu/persistence/dataobject/TrainingApplyRecordDO.java index faf9f17..4c05088 100644 --- a/web-infrastructure/src/main/java/com/zcloud/edu/persistence/dataobject/TrainingApplyRecordDO.java +++ b/web-infrastructure/src/main/java/com/zcloud/edu/persistence/dataobject/TrainingApplyRecordDO.java @@ -45,8 +45,8 @@ public class TrainingApplyRecordDO extends BaseDO { // 关联项目 @ApiModelProperty(value = "关联项目") private String projectName; - //审批状态1:待审批2:审批中,3:审批完成 - @ApiModelProperty(value = "审批状态1:待审批2:审批中,3:审批完成") + //审批状态1:审批中,2:审批完成 + @ApiModelProperty(value = "审批状态1:审批中,2:审批完成") private Long approvalStatus; // 申请人数