From aea22ebf02127c2da806850fd995752d938bdae2 Mon Sep 17 00:00:00 2001
From: tangwei <tangwei0654@163.com>
Date: Mon, 1 Jun 2026 16:51:59 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E7=94=9F=E6=80=81=E6=B5=81=E9=87=8F?=
 =?UTF-8?q?=E7=9B=91=E6=B5=8B=E6=95=B0=E9=87=8F=E7=BB=9F=E8=AE=A1=E4=BC=98?=
 =?UTF-8?q?=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../eq/service/impl/EngEqDataServiceImpl.java      | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/backend/src/main/java/com/yfd/platform/qgc_eng/eq/service/impl/EngEqDataServiceImpl.java b/backend/src/main/java/com/yfd/platform/qgc_eng/eq/service/impl/EngEqDataServiceImpl.java
index 26f9d081..7111940a 100644
--- a/backend/src/main/java/com/yfd/platform/qgc_eng/eq/service/impl/EngEqDataServiceImpl.java
+++ b/backend/src/main/java/com/yfd/platform/qgc_eng/eq/service/impl/EngEqDataServiceImpl.java
@@ -527,7 +527,7 @@ public class EngEqDataServiceImpl implements EngEqDataService {
                                           Map<String, Object> paramMap,
                                           int[] indexHolder) {
         String tableName = "day".equalsIgnoreCase(type) ? "SD_QECDAY_S" : "SD_QEC_R";
-        String timeFilter = buildStaticTimeFilterCondition(filter, paramMap, indexHolder);
+        String timeFilter = buildStaticTimeFilterCondition(filter, paramMap, indexHolder,type);
         StringBuilder sql = new StringBuilder();
         sql.append("SELECT data.STCD, ")
                 .append("(CASE WHEN SUM(CASE WHEN data.SFDB IN (0, 1) THEN 1 ELSE 0 END) = 0 THEN NULL ")
@@ -985,7 +985,7 @@ public class EngEqDataServiceImpl implements EngEqDataService {
 
     private String buildStaticTimeFilterCondition(DataSourceRequest.FilterDescriptor filter,
                                                   Map<String, Object> paramMap,
-                                                  int[] indexHolder) {
+                                                  int[] indexHolder,String type) {
         if (filter == null) {
             return "";
         }
@@ -993,14 +993,20 @@ public class EngEqDataServiceImpl implements EngEqDataService {
             if (!"tm".equalsIgnoreCase(filter.getField())) {
                 return "";
             }
-            return buildGenericCondition("data.TM", filter, paramMap, indexHolder, true);
+            if (type.equals("day")) {
+                return buildGenericCondition("data.DT", filter, paramMap, indexHolder, true);
+            }else{
+                return buildGenericCondition("data.TM", filter, paramMap, indexHolder, true);
+            }
+
+
         }
         if (CollUtil.isEmpty(filter.getFilters())) {
             return "";
         }
         List<String> conditions = new ArrayList<>();
         for (DataSourceRequest.FilterDescriptor child : filter.getFilters()) {
-            String childSql = buildStaticTimeFilterCondition(child, paramMap, indexHolder);
+            String childSql = buildStaticTimeFilterCondition(child, paramMap, indexHolder,type);
             if (StrUtil.isNotBlank(childSql)) {
                 conditions.add("(" + childSql + ")");
             }