From d50dec2d9b92c103134ae4e313c7bbbe5c2f4432 Mon Sep 17 00:00:00 2001
From: 田源 <lastanimals@163.com>
Date: 星期三, 24 四月 2024 16:39:00 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/pagemodel/CodeImportResultVO.java | 53 +++++++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 51 insertions(+), 2 deletions(-)
diff --git a/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/pagemodel/CodeImportResultVO.java b/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/pagemodel/CodeImportResultVO.java
index 93f152f..f3434ad 100644
--- a/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/pagemodel/CodeImportResultVO.java
+++ b/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/pagemodel/CodeImportResultVO.java
@@ -1,6 +1,8 @@
package com.vci.ubcs.code.vo.pagemodel;
+import com.vci.ubcs.starter.revision.model.BaseModel;
+
import java.util.*;
/**
@@ -19,15 +21,31 @@
* 鏄惁鎴愬姛鐨�
*/
private boolean success ;
+
/**
* 鍏抽敭灞炴�ф牎楠岃鍒欑殑淇℃伅
*/
private String keyAttrRuleInfo;
+ /**
+ * 杩戜箟璇嶆煡璇㈠睘鎬ф牎楠岃鍒欑殑淇℃伅
+ */
+ private String synonymRuleInfo;
+
/**
* 鍏抽敭灞炴�ф牎楠屽悗锛岄噸澶嶇殑琛屽彿
*/
private Set<String> keyAttrRepeatRowIndexList = new HashSet<>();
+
+ /***
+ * 鍏抽敭灞炴�х浉鍚岀殑灞炴�id涓庡叾閲嶅鐨勬暟鎹畂id
+ */
+ private Map<String,List<String>> keyAttrOkOidTORepeatOidMap=new HashMap<>();
+
+ /***
+ * 鏍规嵁鍏抽敭鐔熸倝鏌ヨ鐨勯噸澶嶇殑鏁版嵁瀵硅薄
+ */
+ private Map<String, List<BaseModel>> indexTODataMap=new HashMap<>();
/***
* 鏍规嵁鍏抽敭鐔熸倝鏌ヨ鐨勯噸澶嶇殑鏁版嵁瀵硅薄
@@ -49,7 +67,23 @@
*/
private Set<String> unPassVerifyRowIndexSet = new HashSet<>();
- public Set<String> getUnPassVerifyRowIndexSet() {
+ public void setSuccess(boolean success) {
+ this.success = success;
+ }
+
+ public void setSynonymRuleInfo(String synonymRuleInfo) {
+ this.synonymRuleInfo = synonymRuleInfo;
+ }
+
+ public boolean isSuccess() {
+ return success;
+ }
+
+ public String getSynonymRuleInfo() {
+ return synonymRuleInfo;
+ }
+
+ public Set<String> getUnPassVerifyRowIndexSet() {
return unPassVerifyRowIndexSet;
}
@@ -89,7 +123,22 @@
this.selfRepeatRowIndexList = selfRepeatRowIndexList;
}
- /*public Map<String,List<ClientBusinessObject>> getIndexTODataMap() {
+ public Map<String, List<BaseModel>> getIndexTODataMap() {
+ return indexTODataMap;
+ }
+
+ public void setIndexTODataMap(Map<String, List<BaseModel>> indexTODataMap) {
+ this.indexTODataMap = indexTODataMap;
+ }
+
+ public Map<String, List<String>> getKeyAttrOkOidTORepeatOidMap() {
+ return keyAttrOkOidTORepeatOidMap;
+ }
+
+ public void setKeyAttrOkOidTORepeatOidMap(Map<String, List<String>> keyAttrOkOidTORepeatOidMap) {
+ this.keyAttrOkOidTORepeatOidMap = keyAttrOkOidTORepeatOidMap;
+ }
+ /*public Map<String,List<ClientBusinessObject>> getIndexTODataMap() {
return indexTODataMap;
}
--
Gitblit v1.9.3