From 5bc38e6cb327e238d7bcb3cf6e39e95772cbecb8 Mon Sep 17 00:00:00 2001
From: 潘志宝 <979469083@qq.com>
Date: 星期五, 20 六月 2025 12:06:53 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/ind/collection/utils/IndSqlUtils.java | 18 +++++++++++++-----
1 files changed, 13 insertions(+), 5 deletions(-)
diff --git a/iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/ind/collection/utils/IndSqlUtils.java b/iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/ind/collection/utils/IndSqlUtils.java
index a92a5a7..3f99482 100644
--- a/iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/ind/collection/utils/IndSqlUtils.java
+++ b/iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/ind/collection/utils/IndSqlUtils.java
@@ -66,7 +66,7 @@
if (dataSet == null) {
return result;
}
- result.setDataSource(indItem.getDataSource());
+ result.setDataSource(dataSet.getDataSource());
StringBuilder selectSql = new StringBuilder();
IndStatFuncEnum statFun = IndStatFuncEnum.getEumByCode(StringUtils.isBlank(indItem.getStatFunc()) ? IndStatFuncEnum.DEFAULT.getCode() : indItem.getStatFunc());
switch (statFun) {
@@ -166,7 +166,9 @@
break;
case YESTERDAY:
whereSql.append(indItem.getTimeLabel());
- whereSql.append(" <= '");
+ whereSql.append(" < '");
+ calendar.set(Calendar.MINUTE, 0);
+ calendar.set(Calendar.HOUR_OF_DAY, 0);
whereSql.append(DateUtils.format(calendar.getTime(), datePattern));
whereSql.append("' AND ");
whereSql.append(indItem.getTimeLabel());
@@ -177,7 +179,9 @@
break;
case LAST_DAY_7:
whereSql.append(indItem.getTimeLabel());
- whereSql.append(" <= '");
+ whereSql.append(" < '");
+ calendar.set(Calendar.MINUTE, 0);
+ calendar.set(Calendar.HOUR_OF_DAY, 0);
whereSql.append(DateUtils.format(calendar.getTime(), datePattern));
whereSql.append("' AND ");
whereSql.append(indItem.getTimeLabel());
@@ -188,7 +192,9 @@
break;
case LAST_DAY_30:
whereSql.append(indItem.getTimeLabel());
- whereSql.append(" <= '");
+ whereSql.append(" < '");
+ calendar.set(Calendar.MINUTE, 0);
+ calendar.set(Calendar.HOUR_OF_DAY, 0);
whereSql.append(DateUtils.format(calendar.getTime(), datePattern));
whereSql.append("' AND ");
whereSql.append(indItem.getTimeLabel());
@@ -199,7 +205,9 @@
break;
case LAST_DAY_90:
whereSql.append(indItem.getTimeLabel());
- whereSql.append(" <= '");
+ whereSql.append(" < '");
+ calendar.set(Calendar.MINUTE, 0);
+ calendar.set(Calendar.HOUR_OF_DAY, 0);
whereSql.append(DateUtils.format(calendar.getTime(), datePattern));
whereSql.append("' AND ");
whereSql.append(indItem.getTimeLabel());
--
Gitblit v1.9.3