From 3362fc8656fb3587198beb71a56b5bf6525027cc Mon Sep 17 00:00:00 2001
From: 田源 <lastanimals@163.com>
Date: 星期二, 19 三月 2024 11:29:56 +0800
Subject: [PATCH] 整合修改代码

---
 Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/pagemodel/CodeImportResultVO.java |   58 +++++++++++++++++++++++++++++++++++++++++++++++++++++-----
 1 files changed, 53 insertions(+), 5 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 74c749f..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,7 @@
 package com.vci.ubcs.code.vo.pagemodel;
 
-import plm.bs.bom.clientobject.ClientBusinessObject;
+
+import com.vci.ubcs.starter.revision.model.BaseModel;
 
 import java.util.*;
 
@@ -20,20 +21,36 @@
      * 鏄惁鎴愬姛鐨�
      */
     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<>();
+
     /***
      * 鏍规嵁鍏抽敭鐔熸倝鏌ヨ鐨勯噸澶嶇殑鏁版嵁瀵硅薄
      */
-    private Map<String,  List<ClientBusinessObject>> indexTODataMap=new HashMap<>();
+    //private Map<String,  List<ClientBusinessObject>> indexTODataMap=new HashMap<>();
 
     /**
      * excel鑷韩閲嶅鐨勮鍙�
@@ -50,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;
     }
 
@@ -90,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;
     }
 
@@ -117,7 +165,7 @@
                 ", nullRowIndexList=" + nullRowIndexList +
                 ", unPassVerifyRowIndexSet=" + unPassVerifyRowIndexSet +
                 '}';
-    }
+    }*/
 
 
 }

--
Gitblit v1.9.3