From 60fa13f76afe72a6f48416de2904d58164859382 Mon Sep 17 00:00:00 2001
From: houzhongjian <houzhongyi@126.com>
Date: 星期五, 17 一月 2025 13:51:55 +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 |   38 ++++++++++++++++++++++++++++----------
 1 files changed, 28 insertions(+), 10 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 4636904..87fee61 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
@@ -4,10 +4,11 @@
 import com.iailab.module.data.common.enums.IndStatFuncEnum;
 import com.iailab.module.data.common.enums.IndTimeLimitEnum;
 import com.iailab.module.data.ind.data.dto.IndDataSetDTO;
-import com.iailab.module.data.ind.data.service.IndDataSetFieldService;
 import com.iailab.module.data.ind.data.service.IndDataSetService;
+import com.iailab.module.data.ind.item.entity.IndItemEntity;
 import com.iailab.module.data.ind.item.service.IndItemAtomService;
 import com.iailab.module.data.ind.item.service.IndItemDerService;
+import com.iailab.module.data.ind.item.service.IndItemService;
 import com.iailab.module.data.ind.item.vo.IndItemAtomVO;
 import com.iailab.module.data.ind.item.vo.IndItemDerVO;
 import com.iailab.module.data.ind.value.dto.QuerySourceValueDTO;
@@ -33,7 +34,7 @@
     private IndDataSetService indDataSetService;
 
     @Autowired
-    private IndDataSetFieldService indDataSetFieldService;
+    private IndItemService indItemService;
 
     @Autowired
     private IndItemDerService indItemDerService;
@@ -50,6 +51,8 @@
         if (indItem == null) {
             return result;
         }
+        IndItemEntity itemEntity = indItemService.get(itemId);
+        result.setItemNo(itemEntity.getItemNo());
         result.setIndItemAtom(indItem);
         IndDataSetDTO dataSet = indDataSetService.getDet(indItem.getDataSet());
         if (dataSet == null) {
@@ -57,7 +60,7 @@
         }
         result.setDataSource(indItem.getDataSource());
         StringBuilder selectSql = new StringBuilder();
-        IndStatFuncEnum statFun = IndStatFuncEnum.getEumByCode(StringUtils.isBlank(indItem.getStatFunc())? IndStatFuncEnum.DEFAULT.getCode() : indItem.getStatFunc());
+        IndStatFuncEnum statFun = IndStatFuncEnum.getEumByCode(StringUtils.isBlank(indItem.getStatFunc()) ? IndStatFuncEnum.DEFAULT.getCode() : indItem.getStatFunc());
         switch (statFun) {
             case AVG:
                 selectSql.append("AVG(");
@@ -91,19 +94,19 @@
         if (indItem == null) {
             return result;
         }
+        IndItemEntity itemEntity = indItemService.get(itemId);
+        result.setItemNo(itemEntity.getItemNo());
         result = getAtomSql(indItem.getAtomItemId());
 
         // 拼接SELECT
         StringBuilder selectSql = new StringBuilder();
-        if (StringUtils.isNotBlank(indItem.getDimension()) && StringUtils.isNotBlank(result.getIndItemAtom().getStatFunc())){
+        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())){
+        } else if (StringUtils.isBlank(indItem.getDimension()) && StringUtils.isNotBlank(result.getIndItemAtom().getStatFunc())) {
             selectSql.append(result.getSelectSql());
-        }
-        else{
+        } else {
             selectSql.append(result.getSelectSql());
             selectSql.append(", ");
             selectSql.append(indItem.getTimeLabel());
@@ -156,6 +159,18 @@
                 whereSql.append(DateUtils.format(calendar.getTime(), PATTERN_MON));
                 whereSql.append("'");
                 break;
+            case LAST_MONTH:
+                calendar.add(Calendar.MONTH, -1); // 将当前日期减去一个月,得到上个月的日期
+                whereSql.append(indItem.getTimeLabel());
+                whereSql.append(" >= '");
+                whereSql.append(DateUtils.format(calendar.getTime(), PATTERN_MON)); // 上个月的第一天
+                calendar.add(Calendar.MONTH, 1); // 再加一个月,回到当前月
+                whereSql.append("' AND '");
+                whereSql.append(indItem.getTimeLabel());
+                whereSql.append("' < '");
+                whereSql.append(DateUtils.format(calendar.getTime(), PATTERN_MON)); // 当前月
+                whereSql.append("'");
+                break;
             case LAST_MONTH_12:
                 whereSql.append(indItem.getTimeLabel());
                 whereSql.append(" <= '");
@@ -206,14 +221,14 @@
 
         // 拼接GROUP
         StringBuilder groupSql = new StringBuilder();
-        if (StringUtils.isNotBlank(indItem.getDimension())){
+        if (StringUtils.isNotBlank(indItem.getDimension())) {
             groupSql.append(indItem.getDimension());
         }
         result.setGroupSql(groupSql.toString());
 
         // 拼接ORDER
         StringBuilder orderBySql = new StringBuilder();
-        if (StringUtils.isNotBlank(indItem.getDimension()) && indItem.getDimension().equals(indItem.getTimeLabel())){
+        if (StringUtils.isNotBlank(indItem.getDimension()) && indItem.getDimension().equals(indItem.getTimeLabel())) {
             orderBySql.append(indItem.getTimeLabel());
             result.setOrderBySql(orderBySql.toString());
         }
@@ -228,6 +243,9 @@
         }
         result = getAtomSql(indItem.getAtomItemId());
 
+        IndItemEntity itemEntity = indItemService.get(itemId);
+        result.setItemNo(itemEntity.getItemNo());
+
         // 拼接SELECT
         StringBuilder selectSql = new StringBuilder();
         selectSql.append(indItem.getDimension());

--
Gitblit v1.9.3