From 5e7880e4a1fb15d25fa39171fb01df2014931a3e Mon Sep 17 00:00:00 2001 From: zhuxinru Date: Wed, 10 Dec 2025 11:46:10 +0800 Subject: [PATCH] =?UTF-8?q?fix:task=E7=9A=84=E8=AF=84=E5=AE=A1=E7=8A=B6?= =?UTF-8?q?=E6=80=81=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/sdm/project/common/ApprovalStatusEnum.java | 10 +++++----- .../com/sdm/project/model/entity/SimulationTask.java | 2 +- .../java/com/sdm/project/model/vo/SpdmNewTaskVo.java | 2 +- .../com/sdm/project/model/vo/SpdmTaskDetailVo.java | 2 +- .../main/java/com/sdm/project/model/vo/SpdmTaskVo.java | 2 +- 5 files changed, 9 insertions(+), 9 deletions(-) diff --git a/project/src/main/java/com/sdm/project/common/ApprovalStatusEnum.java b/project/src/main/java/com/sdm/project/common/ApprovalStatusEnum.java index e2a73d32..2492e437 100644 --- a/project/src/main/java/com/sdm/project/common/ApprovalStatusEnum.java +++ b/project/src/main/java/com/sdm/project/common/ApprovalStatusEnum.java @@ -5,15 +5,15 @@ import lombok.Getter; @Getter public enum ApprovalStatusEnum { - ING("进行中", "1"), - PASSED("评审通过", "2"), - REJECTED("评审驳回", "3"); + ING("进行中", 1), + PASSED("评审通过", 2), + REJECTED("评审驳回", 3); private final String name; - private final String code; + private final Integer code; - ApprovalStatusEnum(String name, String code) { + ApprovalStatusEnum(String name, Integer code) { this.name = name; this.code = code; } diff --git a/project/src/main/java/com/sdm/project/model/entity/SimulationTask.java b/project/src/main/java/com/sdm/project/model/entity/SimulationTask.java index dd30d771..bd12a6c9 100644 --- a/project/src/main/java/com/sdm/project/model/entity/SimulationTask.java +++ b/project/src/main/java/com/sdm/project/model/entity/SimulationTask.java @@ -105,7 +105,7 @@ public class SimulationTask implements Serializable { private String analyseSoftware; @TableField("approval_status") - private String approvalStatus; + private Integer approvalStatus; @TableField("comfirm_status") private String comfirmStatus; diff --git a/project/src/main/java/com/sdm/project/model/vo/SpdmNewTaskVo.java b/project/src/main/java/com/sdm/project/model/vo/SpdmNewTaskVo.java index 999cc077..a49b3f32 100644 --- a/project/src/main/java/com/sdm/project/model/vo/SpdmNewTaskVo.java +++ b/project/src/main/java/com/sdm/project/model/vo/SpdmNewTaskVo.java @@ -88,7 +88,7 @@ public class SpdmNewTaskVo extends BaseEntity { private String analyseTarget; private String analyseSoftware; - private String approvalStatus; + private Integer approvalStatus; private String comfirmStatus; private String description; /** diff --git a/project/src/main/java/com/sdm/project/model/vo/SpdmTaskDetailVo.java b/project/src/main/java/com/sdm/project/model/vo/SpdmTaskDetailVo.java index 96a63514..754dacb1 100644 --- a/project/src/main/java/com/sdm/project/model/vo/SpdmTaskDetailVo.java +++ b/project/src/main/java/com/sdm/project/model/vo/SpdmTaskDetailVo.java @@ -95,7 +95,7 @@ public class SpdmTaskDetailVo extends BaseEntity { /** * 审批状态 */ - private String approvalStatus; + private Integer approvalStatus; /** * 确认状态 diff --git a/project/src/main/java/com/sdm/project/model/vo/SpdmTaskVo.java b/project/src/main/java/com/sdm/project/model/vo/SpdmTaskVo.java index 7c08920d..140e25cd 100644 --- a/project/src/main/java/com/sdm/project/model/vo/SpdmTaskVo.java +++ b/project/src/main/java/com/sdm/project/model/vo/SpdmTaskVo.java @@ -88,7 +88,7 @@ public class SpdmTaskVo extends BaseEntity { private String analyseTarget; private String analyseSoftware; - private String approvalStatus; + private Integer approvalStatus; private String comfirmStatus; private String description; /**