From 280ca0c6a4a1e73ab4516d4850dedb5a43541594 Mon Sep 17 00:00:00 2001
From: Jay <csj123456>
Date: 星期一, 20 一月 2025 15:25:31 +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 |   53 ++++++++++++++++++++++++++++++++++++-----------------
 1 files changed, 36 insertions(+), 17 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 87fee61..e33849c 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
@@ -139,7 +139,9 @@
                 whereSql.append(indItem.getTimeLabel());
                 whereSql.append(" <= '");
                 whereSql.append(DateUtils.format(calendar.getTime(), PATTERN_DATE));
-                whereSql.append("' AND >= '");
+                whereSql.append("' AND ");
+                whereSql.append(indItem.getTimeLabel());
+                whereSql.append(" >= '");
                 calendar.add(Calendar.DAY_OF_YEAR, -7);
                 whereSql.append(DateUtils.format(calendar.getTime(), PATTERN_DATE));
                 whereSql.append("'");
@@ -148,7 +150,9 @@
                 whereSql.append(indItem.getTimeLabel());
                 whereSql.append(" <= '");
                 whereSql.append(DateUtils.format(calendar.getTime(), PATTERN_DATE));
-                whereSql.append("' AND >= '");
+                whereSql.append("' AND ");
+                whereSql.append(indItem.getTimeLabel());
+                whereSql.append(" >= '");
                 calendar.add(Calendar.DAY_OF_YEAR, -30);
                 whereSql.append(DateUtils.format(calendar.getTime(), PATTERN_DATE));
                 whereSql.append("'");
@@ -183,10 +187,13 @@
                 whereSql.append("'");
                 break;
             case THIS_YEAR_MONTH:
-                calendar.set(Calendar.MONTH, 11);
+                whereSql.append(indItem.getTimeLabel());
                 whereSql.append(" <= '");
+                calendar.set(Calendar.MONTH, 11);
                 whereSql.append(DateUtils.format(calendar.getTime(), PATTERN_MON));
-                whereSql.append("' AND >= '");
+                whereSql.append("' AND ");
+                whereSql.append(indItem.getTimeLabel());
+                whereSql.append(" >= '");
                 calendar.set(Calendar.MONTH, 0);
                 whereSql.append(DateUtils.format(calendar.getTime(), PATTERN_MON));
                 whereSql.append("'");
@@ -248,12 +255,18 @@
 
         // 拼接SELECT
         StringBuilder selectSql = new StringBuilder();
-        selectSql.append(indItem.getDimension());
-        selectSql.append(", ");
-        selectSql.append(result.getSelectSql());
-        selectSql.append(", ");
-        selectSql.append(indItem.getTimeLabel());
-        selectSql.append(" data_time");
+        if (StringUtils.isNotBlank(indItem.getDimension()) && StringUtils.isNotBlank(result.getIndItemAtom().getStatFunc())) {
+            selectSql.append(indItem.getDimension());
+            selectSql.append(", ");
+            selectSql.append(result.getSelectSql());
+        } else if (StringUtils.isBlank(indItem.getDimension()) && StringUtils.isNotBlank(result.getIndItemAtom().getStatFunc())) {
+            selectSql.append(result.getSelectSql());
+        } else {
+            selectSql.append(result.getSelectSql());
+            selectSql.append(", ");
+            selectSql.append(indItem.getTimeLabel());
+            selectSql.append(" data_time");
+        }
         result.setSelectSql(selectSql.toString());
 
         // 拼接WHERE
@@ -261,22 +274,28 @@
         whereSql.append(" ");
         whereSql.append(indItem.getTimeLabel());
         whereSql.append(" <= '");
-        whereSql.append(DateUtils.format(endTime, PATTERN_MON));
-        whereSql.append("' AND >= '");
-        whereSql.append(DateUtils.format(startTime, PATTERN_MON));
+        whereSql.append(DateUtils.format(endTime, DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND));
+        whereSql.append("' AND ");
+        whereSql.append(indItem.getTimeLabel());
+        whereSql.append(" >= '");
+        whereSql.append(DateUtils.format(startTime, DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND));
         whereSql.append("'");
         result.setWhereSql(whereSql.toString());
 
         // 拼接GROUP
         StringBuilder groupSql = new StringBuilder();
-        groupSql.append(" GROUP BY ");
-        groupSql.append(indItem.getDimension());
+        if (StringUtils.isNotBlank(indItem.getDimension())) {
+            groupSql.append(indItem.getDimension());
+        }
         result.setGroupSql(groupSql.toString());
 
         // 拼接ORDER
         StringBuilder orderBySql = new StringBuilder();
-        orderBySql.append(indItem.getTimeLabel());
-        result.setOrderBySql(orderBySql.toString());
+        if (StringUtils.isNotBlank(indItem.getDimension()) && indItem.getDimension().equals(indItem.getTimeLabel())) {
+            orderBySql.append(indItem.getTimeLabel());
+            result.setOrderBySql(orderBySql.toString());
+        }
+
         return result;
     }
 }
\ No newline at end of file

--
Gitblit v1.9.3