From 93b0088bc687bb9b33d226706892e90e4346d608 Mon Sep 17 00:00:00 2001 From: dengzedong <dengzedong@email> Date: 星期三, 21 五月 2025 08:56:53 +0800 Subject: [PATCH] whereSql 派生逻辑 --- iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/ind/collection/utils/IndSqlUtils.java | 16 ++++++++++++---- 1 files changed, 12 insertions(+), 4 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..80a94d7 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 @@ -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