Youchain
/
ZhongWei_Old2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/main'

main
userName 2025-06-19 17:53:55 +08:00
parent a7afd33571 cdd734bd95
commit 1bf7fbf19d
2 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/java/com/dev/energy/server/action/QueryAction.java
View File

@ -273,7 +273,7 @@ public class QueryAction extends AbstractAction implements ApplicationContextAwa
} }
Map params = tableConfig.getParams(); Map params = tableConfig.getParams();
for (Object key : params.keySet()) { /* for (Object key : params.keySet()) {
Object param=params.get(key); Object param=params.get(key);
String param_str=param.toString(); String param_str=param.toString();
if(param_str.indexOf("%")==0){ if(param_str.indexOf("%")==0){
@ -281,7 +281,7 @@ public class QueryAction extends AbstractAction implements ApplicationContextAwa
log.info("替换------"+key.toString()+"====="+param_str+"--"+param_str.indexOf("%")); log.info("替换------"+key.toString()+"====="+param_str+"--"+param_str.indexOf("%"));
} }
} }*/

8
src/main/java/com/dev/energy/server/valuelist/adapter/hib3/Hibernate30Adapter.java
View File

@ -224,8 +224,12 @@ return translator.getSQLString();
String dateString = sdf.format(parm); String dateString = sdf.format(parm);
hql=hql.replace("{"+ketstr+"}", dateString); hql=hql.replace("{"+ketstr+"}", dateString);
}else{ }else{
String param_str=parm.toString();
hql=hql.replace("{"+ketstr+"}", parm.toString().replaceAll(" ", "")); param_str=param_str.trim();
if(param_str.indexOf("%")==0){
param_str=param_str.substring(1);
}
hql=hql.replace("{"+ketstr+"}", param_str);
} }
} }