From d7c4ef6f71312b7a7d1aaa8cbeda53a0a2a41dd6 Mon Sep 17 00:00:00 2001 From: xudawei Date: Wed, 15 Jan 2025 17:09:54 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20(REQ-3300)=20=E5=8F=98=E7=AD=BE?= =?UTF-8?q?=E7=8A=B6=E6=80=81=E6=9E=9A=E4=B8=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../axzo/visa/api/enums/VisaStatusEnum.java | 27 +++++++++++++++++++ .../cn/axzo/visa/api/enums/VisaTypeEnum.java | 7 ++--- .../axzo/visa/server/domain/ChangeRecord.java | 6 +++-- 3 files changed, 35 insertions(+), 5 deletions(-) create mode 100644 visa/visa-api/src/main/java/cn/axzo/visa/api/enums/VisaStatusEnum.java diff --git a/visa/visa-api/src/main/java/cn/axzo/visa/api/enums/VisaStatusEnum.java b/visa/visa-api/src/main/java/cn/axzo/visa/api/enums/VisaStatusEnum.java new file mode 100644 index 00000000..93f44acb --- /dev/null +++ b/visa/visa-api/src/main/java/cn/axzo/visa/api/enums/VisaStatusEnum.java @@ -0,0 +1,27 @@ +package cn.axzo.visa.api.enums; + +import lombok.AccessLevel; +import lombok.AllArgsConstructor; +import lombok.Getter; + +/** + * 签证业务状态 + * + * @author xudawei + * @since 2025-01-15 + */ +@Getter +@AllArgsConstructor(access = AccessLevel.PRIVATE) +public enum VisaStatusEnum { + + TO_REPORT("to_report", "待提报"), + DECIDING("deciding", "决策中"), + EXECUTING( "executing","执行中"), + APPROVING( "approving","审批中"), + COMPLETED( "completed","已完成"), + FORBIDED( "forbided","已废除"), + ; + + private final String code; + private final String desc; +} diff --git a/visa/visa-api/src/main/java/cn/axzo/visa/api/enums/VisaTypeEnum.java b/visa/visa-api/src/main/java/cn/axzo/visa/api/enums/VisaTypeEnum.java index 6c723001..b0886598 100644 --- a/visa/visa-api/src/main/java/cn/axzo/visa/api/enums/VisaTypeEnum.java +++ b/visa/visa-api/src/main/java/cn/axzo/visa/api/enums/VisaTypeEnum.java @@ -14,10 +14,11 @@ import lombok.Getter; @AllArgsConstructor(access = AccessLevel.PRIVATE) public enum VisaTypeEnum { - design_change("bgqz01", "设计变更"), - technology_approved("bgqz02", "技术核定"), - project_visa("bgqz03", "工程签证"); + DESIGN_CHANGE("bgqz01","design_change", "设计变更"), + TECHNOLOGY_APPROVED("bgqz02","technology_approved", "技术核定"), + PROJECT_VISA("bgqz03", "project_visa","工程签证"); private final String processDefinitionKey; + private final String code; private final String desc; } diff --git a/visa/visa-server/src/main/java/cn/axzo/visa/server/domain/ChangeRecord.java b/visa/visa-server/src/main/java/cn/axzo/visa/server/domain/ChangeRecord.java index 93f3fe6c..8793e802 100644 --- a/visa/visa-server/src/main/java/cn/axzo/visa/server/domain/ChangeRecord.java +++ b/visa/visa-server/src/main/java/cn/axzo/visa/server/domain/ChangeRecord.java @@ -1,6 +1,8 @@ package cn.axzo.visa.server.domain; import cn.axzo.pokonyan.config.mybatisplus.BaseEntity; +import cn.axzo.visa.api.enums.VisaStatusEnum; +import cn.axzo.visa.api.enums.VisaTypeEnum; import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; @@ -73,13 +75,13 @@ public class ChangeRecord extends BaseEntity { * 单据类型 */ @TableField(value = "type") - private String type; + private VisaTypeEnum type; /** * 状态 */ @TableField(value = "status") - private String status; + private VisaStatusEnum status; /** * 最终审批ID