From 1d3d3de0030c2106114ca8afb31f609c850f526e Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期三, 02 八月 2023 11:04:30 +0800
Subject: [PATCH] Merge branch 'master' of http://dev.vci-tech.com:1065/r/ubcs
---
Source/UBCS/ubcs-codeApply/src/main/java/com/vci/ubcs/codeapply/AttarSearchPanel.java | 23 ++++++++---------------
1 files changed, 8 insertions(+), 15 deletions(-)
diff --git a/Source/UBCS/ubcs-codeApply/src/main/java/com/vci/ubcs/codeapply/attarSearchPanel.java b/Source/UBCS/ubcs-codeApply/src/main/java/com/vci/ubcs/codeapply/AttarSearchPanel.java
similarity index 91%
rename from Source/UBCS/ubcs-codeApply/src/main/java/com/vci/ubcs/codeapply/attarSearchPanel.java
rename to Source/UBCS/ubcs-codeApply/src/main/java/com/vci/ubcs/codeapply/AttarSearchPanel.java
index d132291..b4c284b 100644
--- a/Source/UBCS/ubcs-codeApply/src/main/java/com/vci/ubcs/codeapply/attarSearchPanel.java
+++ b/Source/UBCS/ubcs-codeApply/src/main/java/com/vci/ubcs/codeapply/AttarSearchPanel.java
@@ -10,16 +10,14 @@
import org.apache.commons.collections4.CollectionUtils;
import java.awt.*;
-import java.util.Iterator;
-import java.util.LinkedHashMap;
+import java.util.*;
import java.util.List;
-import java.util.Set;
-public class attarSearchPanel extends VCIJPanel {
+public class AttarSearchPanel extends VCIJPanel {
private LinkedHashMap<String , VCIJTextField> attrInerNameValMap = new LinkedHashMap<String,VCIJTextField>();
private UIFormRefer uiFormRefer;
- public attarSearchPanel(UIFormRefer uiFormRefer){
+ public AttarSearchPanel(UIFormRefer uiFormRefer){
this.uiFormRefer = uiFormRefer;
init();
}
@@ -76,9 +74,9 @@
* @time 2013-3-17
* @return
*/
- public String getAttrSearchFilterString(){
+ public Map<String,String> getAttrSearchFilterString(){
String result = "";
- StringBuilder sql = new StringBuilder();
+ Map<String,String> customConditionMap=new HashMap<>();
Set<String> keys = attrInerNameValMap.keySet();
for (Iterator it = keys.iterator(); it.hasNext();) {
String key = (String)it.next();
@@ -86,15 +84,10 @@
String message = textField.getText().replaceAll(" ", "").trim();
if(message.equals("")) continue;
String text = getTextQueryVal(message);
- sql.append(" "+key+" ");
- sql.append(" like ");
- sql.append("'"+text+"'");
- sql.append(" and");
+ customConditionMap.put(key,text);
}
- if(sql.length() != 0){
- result = sql.substring(0, sql.lastIndexOf("and"));
- }
- return result;
+
+ return customConditionMap;
}
/**
--
Gitblit v1.9.3