From 604d00f67ddcf25a9d079ceddd1c668b2a4e5288 Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期五, 19 四月 2024 15:08:22 +0800
Subject: [PATCH] bug修复

---
 ruoyi-common/src/main/java/com/ruoyi/common/enums/FieldTypeEnum.java |   41 +++++++++++++++++++++++++++--------------
 1 files changed, 27 insertions(+), 14 deletions(-)

diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/enums/FieldTypeEnum.java b/ruoyi-common/src/main/java/com/ruoyi/common/enums/FieldTypeEnum.java
index 7d5ace4..5ea5530 100644
--- a/ruoyi-common/src/main/java/com/ruoyi/common/enums/FieldTypeEnum.java
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/enums/FieldTypeEnum.java
@@ -1,23 +1,36 @@
 package com.ruoyi.common.enums;
 
-import lombok.Getter;
+import com.baomidou.mybatisplus.annotation.EnumValue;
+import com.fasterxml.jackson.annotation.JsonValue;
 import lombok.AllArgsConstructor;
+import lombok.Getter;
+
 @Getter
 @AllArgsConstructor
 public enum FieldTypeEnum {
-	NUMBER(1, "数字"),
-	TEXT(2, "文本"),
-	PERCENTAGE(3, "百分比");
+    NUMBER(1, "数字"),
+    TEXT(2, "文本"),
+    PERCENTAGE(3, "百分比");
+    @EnumValue
+    private final Integer code;
+    @JsonValue
+    private final String desc;
 
-	private final Integer code;
-	private final String desc;
+    public static FieldTypeEnum getEnumByCode(Integer code) {
+        for (FieldTypeEnum e : FieldTypeEnum.values()) {
+            if (e.code.equals(code)) {
+                return e;
+            }
+        }
+        return null;
+    }
 
-	public static FieldTypeEnum getEnumByCode(Integer code) {
-		for (FieldTypeEnum e : FieldTypeEnum.values()) {
-			if (e.code.equals(code)) {
-				return e;
-			}
-		}
-		return null;
-	}
+    public static FieldTypeEnum getEnumByDesc(String desc) {
+        for (FieldTypeEnum e : FieldTypeEnum.values()) {
+            if (e.desc.equals(desc)) {
+                return e;
+            }
+        }
+        return null;
+    }
 } 
\ No newline at end of file

--
Gitblit v1.7.1