From ad67e60bdc758f04b813f4a08b711504a5d0c996 Mon Sep 17 00:00:00 2001
From: Jay <csj123456>
Date: 星期三, 30 四月 2025 11:28:49 +0800
Subject: [PATCH] 新增最近90天指标时间限定
---
iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/ind/collection/utils/IndSqlUtils.java | 13 +++++++++++--
iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/common/enums/IndTimeLimitEnum.java | 1 +
2 files changed, 12 insertions(+), 2 deletions(-)
diff --git a/iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/common/enums/IndTimeLimitEnum.java b/iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/common/enums/IndTimeLimitEnum.java
index dc5b09a..ffbc928 100644
--- a/iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/common/enums/IndTimeLimitEnum.java
+++ b/iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/common/enums/IndTimeLimitEnum.java
@@ -16,6 +16,7 @@
YESTERDAY("YESTERDAY", "昨天"),
LAST_DAY_7("LAST_DAY_7", "最近7天"),
LAST_DAY_30("LAST_DAY_30", "最近30天"),
+ LAST_DAY_90("LAST_DAY_90", "最近90天"),
THIS_MONTH("THIS_MONTH", "当前月"),
LAST_MONTH("LAST_MONTH", "上月"),
LAST_MONTH_12("LAST_MONTH_12", "最近12个月"),
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 a2e3f09..30f6c76 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
@@ -18,8 +18,6 @@
import org.springframework.stereotype.Component;
import java.text.SimpleDateFormat;
-import java.time.YearMonth;
-import java.time.format.DateTimeFormatter;
import java.util.Calendar;
import java.util.Date;
@@ -186,6 +184,17 @@
whereSql.append(DateUtils.format(calendar.getTime(), datePattern));
whereSql.append("'");
break;
+ case LAST_DAY_90:
+ whereSql.append(indItem.getTimeLabel());
+ whereSql.append(" <= '");
+ whereSql.append(DateUtils.format(calendar.getTime(), datePattern));
+ whereSql.append("' AND ");
+ whereSql.append(indItem.getTimeLabel());
+ whereSql.append(" >= '");
+ calendar.add(Calendar.DAY_OF_YEAR, -90);
+ whereSql.append(DateUtils.format(calendar.getTime(), datePattern));
+ whereSql.append("'");
+ break;
case THIS_MONTH:
whereSql.append(indItem.getTimeLabel());
whereSql.append("='");
--
Gitblit v1.9.3