From bc0fdd1f0c20ca4737e8f073050f37b27a658694 Mon Sep 17 00:00:00 2001
From: hongjli <3117313295@qq.com>
Date: 星期四, 22 五月 2025 16:31:12 +0800
Subject: [PATCH] 管路&气柜产能负载优化,实现动态row聚合统计

---
 aps-modules/aps-core/src/main/java/com/aps/core/mapper/ApsGasPipelinePredictionMapper.java |   15 +++++----------
 1 files changed, 5 insertions(+), 10 deletions(-)

diff --git a/aps-modules/aps-core/src/main/java/com/aps/core/mapper/ApsGasPipelinePredictionMapper.java b/aps-modules/aps-core/src/main/java/com/aps/core/mapper/ApsGasPipelinePredictionMapper.java
index ef687da..7ca23e2 100644
--- a/aps-modules/aps-core/src/main/java/com/aps/core/mapper/ApsGasPipelinePredictionMapper.java
+++ b/aps-modules/aps-core/src/main/java/com/aps/core/mapper/ApsGasPipelinePredictionMapper.java
@@ -74,18 +74,13 @@
             select id,  factory || '##' || material_code || '##' || TO_CHAR(predict_date, 'yyyy-MM') as key
              from aps_gas_pipeline_prediction
             where 1 = 0
-            <if test="!facs.isEmpty()">or factory in
-                <foreach collection="facs" item="item" open="(" separator="," close=")">
+            <if test="!keys.isEmpty()">or factory || '##' || material_code || '##' || TO_CHAR(predict_date, 'yyyy-MM') in
+                <foreach collection="keys" item="item" open="(" separator="," close=")">
                     #{item}
-                </foreach>                                 
-            </if> 
-            <if test="!facs.isEmpty()">or material_code in
-                <foreach collection="codes" item="item" open="(" separator="," close=")">
-                    #{item}
-                </foreach>                                 
-            </if> 
+                </foreach>
+            </if>
         </script>
     """)
-    List<Map<String, Object>> selectByFacOrMaterial(@NotNull Set<String> facs, @NotNull Set<String> codes);
+    List<Map<String, Object>> selectByFacOrMaterial(@NotNull Set<String> keys);
 
 }

--
Gitblit v1.9.3