From 6e0d1d51916e4f41e06c06e984a70ebd08352d95 Mon Sep 17 00:00:00 2001
From: houzhongjian <houzhongyi@126.com>
Date: 星期四, 26 六月 2025 09:35:49 +0800
Subject: [PATCH] 打包加密jar包配置
---
iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/ind/collection/utils/IndSqlUtils.java | 49 ++++++++++++++++++++++++++++++++++++++++---------
1 files changed, 40 insertions(+), 9 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 08f68dd..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
@@ -153,20 +153,35 @@
switch (timeLimit) {
case TODAY:
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());
+ whereSql.append(" < '");
+ calendar.add(Calendar.DAY_OF_YEAR, 1);
whereSql.append(DateUtils.format(calendar.getTime(), datePattern));
whereSql.append("'");
break;
case YESTERDAY:
- calendar.add(Calendar.DAY_OF_YEAR, -1);
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());
+ whereSql.append(" >= '");
+ calendar.add(Calendar.DAY_OF_YEAR, -1);
whereSql.append(DateUtils.format(calendar.getTime(), datePattern));
whereSql.append("'");
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());
@@ -177,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());
@@ -188,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());
@@ -244,15 +263,27 @@
whereSql.append("'");
break;
case LAST_YEAR:
- calendar.add(Calendar.YEAR, -1);
whereSql.append(indItem.getTimeLabel());
- whereSql.append("='");
+ whereSql.append(" <= '");
+ whereSql.append(DateUtils.format(calendar.getTime(), datePattern));
+ whereSql.append("' AND ");
+ whereSql.append(indItem.getTimeLabel());
+ whereSql.append(" >= '");
+ calendar.add(Calendar.YEAR, -1);
whereSql.append(DateUtils.format(calendar.getTime(), datePattern));
whereSql.append("'");
break;
case THIS_YEAR:
whereSql.append(indItem.getTimeLabel());
- whereSql.append("='");
+ whereSql.append(" >= '");
+ calendar.set(Calendar.MINUTE, 0);
+ calendar.set(Calendar.HOUR_OF_DAY, 0);
+ calendar.set(Calendar.DAY_OF_YEAR, 1);
+ whereSql.append(DateUtils.format(calendar.getTime(), datePattern));
+ whereSql.append("' AND ");
+ whereSql.append(indItem.getTimeLabel());
+ whereSql.append(" < '");
+ calendar.add(Calendar.YEAR, 1);
whereSql.append(DateUtils.format(calendar.getTime(), datePattern));
whereSql.append("'");
break;
--
Gitblit v1.9.3