diff --git a/src_core/com/tenwa/flow/flowHistory/FlowHitoryUtil.java b/src_core/com/tenwa/flow/flowHistory/FlowHitoryUtil.java index 1c91a20f8..6493b2967 100644 --- a/src_core/com/tenwa/flow/flowHistory/FlowHitoryUtil.java +++ b/src_core/com/tenwa/flow/flowHistory/FlowHitoryUtil.java @@ -5,6 +5,7 @@ import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Map; +import java.util.Set; import java.util.regex.Matcher; import java.util.regex.Pattern; @@ -70,12 +71,26 @@ public class FlowHitoryUtil { this.jboSQL="select "+this.jboSQLColumn +" from "+this.jboFrom+" where "+this.jboWhere+" " + this.jboGroup + this.jboOrder; } } - + public static Map transformtoUpperCase(Map orgMap){ + Map resultMap = new HashMap<>(); + + if (orgMap == null || orgMap.isEmpty()){ + return resultMap; + } + Set keySet = orgMap.keySet(); + for (String key : keySet){ + String newKey = key.toUpperCase(); + //newKey = newKey.replace("_", ""); + resultMap.put(newKey, orgMap.get(key)); + } + return resultMap; + } public String loadJsonData(Mapparam,String isMulti) throws Exception{ + Map resultMap=this.transformtoUpperCase(param); BizObjectQuery flowQuery=JBOFactory.createBizObjectQuery(this.jboClass,this.jboSQL); List sqlParam=this.getSQLParam(this.jboWhere); for(int i=0;i list =flowQuery.getResultList(false); JSONObject phaseInfoJsonObject=JSONObject.createObject(); @@ -181,7 +196,7 @@ public class FlowHitoryUtil { Pattern p = Pattern.compile("(:[\\S]+)"); Matcher m = p.matcher(swhere); while (m.find()) { - String key= m.group(1).toString(); + String key= m.group(1).toString().toUpperCase(); key=key.replace(":",""); param.add(key); }