From e3f2259fcece27f7b98d466b08cbc571de043fd7 Mon Sep 17 00:00:00 2001
From: 田源 <lastanimals@163.com>
Date: 星期五, 26 一月 2024 16:59:59 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/constant/BtmTypeFieldConstant.java | 32 ++++++++++++++++++++++++--------
1 files changed, 24 insertions(+), 8 deletions(-)
diff --git a/Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/constant/BtmTypeFieldConstant.java b/Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/constant/BtmTypeFieldConstant.java
index dd693ee..40a4128 100644
--- a/Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/constant/BtmTypeFieldConstant.java
+++ b/Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/constant/BtmTypeFieldConstant.java
@@ -1,5 +1,7 @@
package com.vci.ubcs.omd.constant;
+import com.vci.ubcs.starter.util.DefaultAttrAssimtUtil;
+
import java.util.HashMap;
import java.util.Map;
@@ -27,6 +29,8 @@
public static final Map<String, String> LIFECYCLE_MANAGE_FIELD_MAP;
+ public static final Map<String, String> MASTERDATA_FIELD_MAP;
+
public static final Map<String, String> SECRET_MANAGE_FIELD_MAP;
public static final Map<String, String> LINK_TYPE_FIELD_MAP;
@@ -40,10 +44,10 @@
{
this.put("nameoid", "瀵硅薄涓婚敭");
this.put("revisionoid", "鐗堟湰涓婚敭");
- this.put("lastr", "鏄惁鏈�鏂扮増鏈�");
- this.put("firstr", "鏄惁鏈�鑰佺増鏈�");
- this.put("lastv", "鏄惁鏈�鏂扮増娆�");
- this.put("firstv", "鏄惁鏈�鑰佺増娆�");
+// this.put("lastr", "鏄惁鏈�鏂扮増鏈�");
+// this.put("firstr", "鏄惁鏈�鑰佺増鏈�");
+// this.put("lastv", "鏄惁鏈�鏂扮増娆�");
+// this.put("firstv", "鏄惁鏈�鑰佺増娆�");
this.put("revisionrule", "鐗堟湰瑙勫垯");
this.put("revisionseq", "鐗堟湰鎺掑簭鍙�");
this.put("revisionvalue", "鐗堟湰鍊�");
@@ -71,14 +75,26 @@
this.put("ts", "鏃堕棿鎴�");
this.put("owner", "鎷ユ湁鑰�");
this.put("tenant_id","绉熸埛");
+ // TODO:鍥犱负涓绘暟鎹煡璇唬鐮佷腑榛樿灏辨妸杩欎簺瀛楁缁欏甫涓婁簡锛屾墍浠ヤ篃寰楀姞鍦ㄩ粯璁ゅ睘鎬ч噷闈�
+ this.put("lastr", "鏄惁鏈�鏂扮増鏈�");
+ this.put("firstr", "鏄惁鏈�鑰佺増鏈�");
+ this.put("lastv", "鏄惁鏈�鏂扮増娆�");
+ this.put("firstv", "鏄惁鏈�鑰佺増娆�");
}
};
BASE_MODEL_COMPATIBILITY_MAP = new HashMap() {
{
- this.put("lastr", "lastr");
- this.put("firstr", "firstr");
- this.put("lastv", "lastv");
- this.put("firstv", "firstv");
+ this.put("lastr", "鏄惁鏈�鏂扮増鏈�");
+ this.put("firstr", "鏄惁鏈�鑰佺増鏈�");
+ this.put("lastv", "鏄惁鏈�鏂扮増娆�");
+ this.put("firstv", "鏄惁鏈�鑰佺増娆�");
+ }
+ };
+ MASTERDATA_FIELD_MAP = new HashMap() {
+ {
+ this.put("codeclsfid","鍒嗙被鐨勪富閿瓧娈�");
+ this.put("codeclsfpath", "鍒嗙被鍏ㄨ矾寰勭殑瀛楁");
+ this.put("codetemplateoid", "妯℃澘鐨勪富閿瓧娈�");
}
};
LIFECYCLE_MANAGE_FIELD_MAP = new HashMap() {
--
Gitblit v1.9.3