From 02b3d584d201ca7cb8a024fd151fe6eddbf43def Mon Sep 17 00:00:00 2001
From: 田源 <lastanimals@163.com>
Date: 星期五, 01 三月 2024 16:31:10 +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 | 35 +++++++++++++++++++++++++++++++----
1 files changed, 31 insertions(+), 4 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..4a40baf 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,6 +21,7 @@
* 鏄惁鎴愬姛鐨�
*/
private boolean success ;
+
/**
* 鍏抽敭灞炴�ф牎楠岃鍒欑殑淇℃伅
*/
@@ -30,10 +32,20 @@
*/
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鑷韩閲嶅鐨勮鍙�
@@ -90,7 +102,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 +144,7 @@
", nullRowIndexList=" + nullRowIndexList +
", unPassVerifyRowIndexSet=" + unPassVerifyRowIndexSet +
'}';
- }
+ }*/
}
--
Gitblit v1.9.3