From 26236b2c1db3c22a8612137a2ca060e310facbfd Mon Sep 17 00:00:00 2001 From: "1437892690@qq.com" <1437892690@qq.com> Date: Sat, 22 Nov 2025 16:15:37 +0800 Subject: [PATCH 1/2] =?UTF-8?q?[=E5=8A=9F=E8=83=BD]=20=E6=8A=A5=E8=A1=A8?= =?UTF-8?q?=E4=BB=A3=E7=A0=81=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 关联 #[1560207430221827]报表代码优化 http://192.168.0.96:8090/demo/rdm.html#/story-detail/939050947543040/939050947543042/1560207430221827 --- .../java/neatlogic/framework/sqlrunner/SqlInfo.java | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/src/main/java/neatlogic/framework/sqlrunner/SqlInfo.java b/src/main/java/neatlogic/framework/sqlrunner/SqlInfo.java index ae30d323a..668baffa4 100644 --- a/src/main/java/neatlogic/framework/sqlrunner/SqlInfo.java +++ b/src/main/java/neatlogic/framework/sqlrunner/SqlInfo.java @@ -60,6 +60,8 @@ public class SqlInfo { */ private Integer pageSize = 20; + private String tableContent; + public String getId() { return id; } @@ -147,4 +149,12 @@ public class SqlInfo { public void setPageSize(Integer pageSize) { this.pageSize = pageSize; } + + public String getTableContent() { + return tableContent; + } + + public void setTableContent(String tableContent) { + this.tableContent = tableContent; + } } -- Gitee From fb558b3c0102876275deea3b9f0195396b9bc89f Mon Sep 17 00:00:00 2001 From: "1437892690@qq.com" <1437892690@qq.com> Date: Sat, 22 Nov 2025 16:55:02 +0800 Subject: [PATCH 2/2] =?UTF-8?q?[=E5=8A=9F=E8=83=BD]=20=E6=8A=A5=E8=A1=A8?= =?UTF-8?q?=E4=BB=A3=E7=A0=81=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 关联 #[1560207430221827]报表代码优化 http://192.168.0.96:8090/demo/rdm.html#/story-detail/939050947543040/939050947543042/1560207430221827 --- .../framework/sqlrunner/SqlRunner.java | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) diff --git a/src/main/java/neatlogic/framework/sqlrunner/SqlRunner.java b/src/main/java/neatlogic/framework/sqlrunner/SqlRunner.java index 51253ae49..647e8ce7f 100644 --- a/src/main/java/neatlogic/framework/sqlrunner/SqlRunner.java +++ b/src/main/java/neatlogic/framework/sqlrunner/SqlRunner.java @@ -30,10 +30,7 @@ import javax.sql.DataSource; import java.io.ByteArrayInputStream; import java.io.IOException; import java.nio.charset.StandardCharsets; -import java.util.ArrayList; -import java.util.Collection; -import java.util.List; -import java.util.Map; +import java.util.*; import java.util.stream.Collectors; @Component @@ -59,16 +56,16 @@ public class SqlRunner { this(mapperXml, namespace, null); } - public SqlRunner(String mapperXml, DataSource dataSource) { - this(mapperXml, null, dataSource); + public SqlRunner(String mapperXml, DataSource _dataSource) { + this(mapperXml, null, _dataSource); } - public SqlRunner(String mapperXml, String namespace, DataSource dataSource) { + public SqlRunner(String mapperXml, String namespace, DataSource _dataSource) { if (StringUtils.isNotBlank(namespace)) { this.namespace = namespace; } - if (dataSource != null) { - this.dataSource = dataSource; + if (_dataSource != null) { + dataSource = _dataSource; } Configuration configuration = new Configuration(); @@ -76,9 +73,10 @@ public class SqlRunner { configuration.addInterceptor(new SqlCostInterceptor()); configuration.addInterceptor(new LimitInterceptor()); configuration.addInterceptor(new PageInterceptor()); - Environment environment = new Environment("", new SpringManagedTransactionFactory(), this.dataSource); + Environment environment = new Environment("", new SpringManagedTransactionFactory(), dataSource); configuration.setEnvironment(environment); configuration.setDefaultStatementTimeout(Config.SQLRUNNER_QUERY_TIMEOUT()); + configuration.setCallSettersOnNulls(true); StringBuilder stringBuilder = new StringBuilder(); stringBuilder.append(DOCTYPE); stringBuilder.append(""); -- Gitee