From 426cad0dd0eef1aefb59c6aaa2e2a2448773dc0b Mon Sep 17 00:00:00 2001
From: yuxc <653031404@qq.com>
Date: 星期一, 24 七月 2023 17:29:24 +0800
Subject: [PATCH] 1、修改查询按钮时的条件，使用编码来查询。 2、增加申请编码时增加设置默认的租户编码。 3、对传入in('条件sql拼接报错问题进行了修改。 4、模板的启用前进行了对分类启用状态的一个判断工作。
---
Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/pagemodel/CodeImportResultVO.java | 16 ++++++++++++++--
1 files changed, 14 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..9592564 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.*;
/**
@@ -28,7 +30,10 @@
* 鍏抽敭灞炴�ф牎楠屽悗锛岄噸澶嶇殑琛屽彿
*/
private Set<String> keyAttrRepeatRowIndexList = new HashSet<>();
-
+ /***
+ * 鏍规嵁鍏抽敭鐔熸倝鏌ヨ鐨勯噸澶嶇殑鏁版嵁瀵硅薄
+ */
+ private Map<String, List<BaseModel>> indexTODataMap=new HashMap<>();
/***
* 鏍规嵁鍏抽敭鐔熸倝鏌ヨ鐨勯噸澶嶇殑鏁版嵁瀵硅薄
*/
@@ -89,7 +94,14 @@
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<ClientBusinessObject>> getIndexTODataMap() {
return indexTODataMap;
}
--
Gitblit v1.9.3