From dd9e34d4379ea31b44b5ac2f5a60ae5ab4b13030 Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期五, 05 七月 2024 16:36:48 +0800
Subject: [PATCH] Merge branch 'master' of http://8.140.179.55:20000/r/pipIrr-SV
---
pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/util/Org.java | 39 ++++++++++++++++++++++++++++++++-------
1 files changed, 32 insertions(+), 7 deletions(-)
diff --git a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/util/Org.java b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/util/Org.java
index a436ccd..fa3fdc0 100644
--- a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/util/Org.java
+++ b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/util/Org.java
@@ -5,10 +5,17 @@
import com.alibaba.fastjson2.annotation.JSONField;
import com.baomidou.mybatisplus.annotation.EnumValue;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
public enum Org {
- Ym("ym", "鍏冭皨"),
- Pj("pj", "鐗囪闀�") ;
+// Ym("ym", "鍏冭皨"),
+// Pj("pj", "鐗囪闀�"),
+ Sp("sp", "娌欑洏"),
+ Jyg("ym", "鍢夊唱鍏�");
@EnumValue
public String tag ;
@@ -17,6 +24,17 @@
Org(String tag, String name){
this.tag = tag ;
this.name = name ;
+ }
+ //鐢ㄦ潵杞琷son
+ public static List<Map> OrgList = new ArrayList<>();
+ static {
+ Org[] all = Org.values();
+ for (Org one : all) {
+ Map<String, String> objMap = new HashMap<>();
+ objMap.put("tag", one.tag);
+ objMap.put("name", one.name);
+ OrgList.add(objMap) ;
+ }
}
public String getTag() {
@@ -28,15 +46,22 @@
}
public static Org get(String tag){
- if(tag.equals(Ym.tag)){
- return Ym ;
- }else if(tag.equals(Pj.tag)){
- return Pj ;
+// if(tag.equals(Ym.tag) || tag.equals(Jyg.tag)){
+// return Ym ;
+// }else if(tag.equals(Pj.tag)){
+// return Pj ;
+// }
+ if(tag.equals(Jyg.tag)){
+ return Jyg ;
+ }else if(tag.equals(Sp.tag)) {
+ return Sp;
}
return null ;
}
+
+
@JSONField
- JSONObject toJson() {
+ public JSONObject toJson() {
return JSONObject.of("tag", getTag(), "name", getName());
}
}
\ No newline at end of file
--
Gitblit v1.8.0