From a6470c4de7867f5478197c390c158ad730ff5bae Mon Sep 17 00:00:00 2001
From: lrj <386002446@qq.com>
Date: 星期五, 25 十月 2024 14:51:21 +0800
Subject: [PATCH] bug
---
src/main/java/com/ycl/scheme/SqlQueryBuilder.java | 18 ++++++------------
1 files changed, 6 insertions(+), 12 deletions(-)
diff --git a/src/main/java/com/ycl/scheme/SqlQueryBuilder.java b/src/main/java/com/ycl/scheme/SqlQueryBuilder.java
index 139c92b..928bc38 100644
--- a/src/main/java/com/ycl/scheme/SqlQueryBuilder.java
+++ b/src/main/java/com/ycl/scheme/SqlQueryBuilder.java
@@ -128,7 +128,6 @@
throw new RuntimeException("缁撴灉琛ㄨ揪寮忎笉姝ｇ‘");
}
-
String fields = ss[0];
String compareStr = resultText.substring(fields.length());
fields+=" ";
@@ -150,9 +149,10 @@
res +=c;
}
idx++;
- if(kw!=null && !kw.getKeywordType().equals(KeywordType.FUNCTION) && kw.getCode().equals("count") && !c.equals("(")){
- res+=c;
+ if(kw==null || !kw.getKeywordType().equals(KeywordType.FUNCTION) || kw.getFunctionParameterNullable()==null || !kw.getFunctionParameterNullable()){
+ res +=c;
}
+
skw="";
}else{
skw += c;
@@ -180,7 +180,7 @@
StringBuilder csb = new StringBuilder();
String sql = "\"" +this.sql + "\"";
csb.append(" def " + funcName + "(){\n");
- csb.append(" Map<String,Object> pars = new HashMap<>();\n");
+ csb.append(" Map<String,Object> pars = super.getSqlParameters();\n");
csb.append(" def sql= " +sql + ";\n");
this.parameters.forEach((k,v)->{
@@ -285,11 +285,7 @@
}
throw new RuntimeException("璇诲彇瀛楁鍚嶇О鏃跺彂鐢熼敊璇�");
-
}
-
-
-
private MatchResult matchLike(String skw,Keyword lkw,int idx){
String sub = blockText.getExpression().substring(idx);
@@ -383,11 +379,11 @@
//鏈夊嚑涓棶鍙凤紝灏辫鏈夊嚑涓搴旂殑鍙傛暟
Parameter p1 = new Parameter();
- p1.setName("beginTime");
+ p1.setName("endTime");
p1.setScript("LocalDateTime.now()");
p1.setTypeName("LocalDateTime");
Parameter p2 = new Parameter();
- p2.setName("endTime");
+ p2.setName("beginTime");
p2.setScript("LocalDateTime.now().minusDays("+day+ ")");
p2.setTypeName("LocalDateTime");
parameters.put(p1.getName(),p1);
@@ -402,7 +398,5 @@
return rs;
}
-
-
}
--
Gitblit v1.8.0