From ad2fb377ee5720314825daced280c00d0c8716d3 Mon Sep 17 00:00:00 2001
From: hongjli <3117313295@qq.com>
Date: 星期五, 23 五月 2025 16:20:45 +0800
Subject: [PATCH] 管路&气柜产能负载设计产能增加对专业过滤
---
aps-modules/aps-core/src/main/java/com/aps/core/service/impl/ApsGasPipingRouteStatServiceImpl.java | 4 ++--
aps-modules/aps-core/src/main/resources/mapper/core/ApsGasPipelineCapacityPlanMapper.xml | 3 +++
2 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/aps-modules/aps-core/src/main/java/com/aps/core/service/impl/ApsGasPipingRouteStatServiceImpl.java b/aps-modules/aps-core/src/main/java/com/aps/core/service/impl/ApsGasPipingRouteStatServiceImpl.java
index 8102872..248f120 100644
--- a/aps-modules/aps-core/src/main/java/com/aps/core/service/impl/ApsGasPipingRouteStatServiceImpl.java
+++ b/aps-modules/aps-core/src/main/java/com/aps/core/service/impl/ApsGasPipingRouteStatServiceImpl.java
@@ -1744,7 +1744,7 @@
// 浣跨敤涓撶敤鏌ヨ鏂规硶鏌ヨ璁捐浜ц兘鏁版嵁
// 鎸夋枃妗ｈ姹傦細鏍规嵁process_name鍜宲lant鍘籥ps_gas_pipeline_capacity_plan琛ㄤ腑鏌ヨ
capacityPlans = apsGasPipelineCapacityPlanMapper.selectDesignCapacityForInterface2(
- processName.trim(), year, month, null, plant);
+ processName.trim(), year, month, major, plant);
// 灏嗙粨鏋滃瓨鍏ョ紦瀛�
capacityPlanCache.put(cacheKey, capacityPlans);
@@ -1811,7 +1811,7 @@
// 浣跨敤涓撶敤鏌ヨ鏂规硶鏌ヨ璁捐浜ц兘鏁版嵁
// 鎸夋枃妗ｈ姹傦細鏍规嵁process_name鍜宲lant鍘籥ps_gas_pipeline_capacity_plan琛ㄤ腑鏌ヨ
capacityPlans = apsGasPipelineCapacityPlanMapper.selectDesignCapacityForInterface2(
- processName, year, month, null, plant);
+ processName, year, month, major, plant);
// 灏嗙粨鏋滃瓨鍏ョ紦瀛�
capacityPlanCache.put(cacheKey, capacityPlans);
diff --git a/aps-modules/aps-core/src/main/resources/mapper/core/ApsGasPipelineCapacityPlanMapper.xml b/aps-modules/aps-core/src/main/resources/mapper/core/ApsGasPipelineCapacityPlanMapper.xml
index b41970a..9cf0dc8 100644
--- a/aps-modules/aps-core/src/main/resources/mapper/core/ApsGasPipelineCapacityPlanMapper.xml
+++ b/aps-modules/aps-core/src/main/resources/mapper/core/ApsGasPipelineCapacityPlanMapper.xml
@@ -160,6 +160,9 @@
<if test="month != null and month != ''">
and CAST(month AS INTEGER) = CAST(#{month} AS INTEGER)
</if>
+ <if test="major != null and major != ''">
+ and major = #{major}
+ </if>
<if test="orgCode != null and orgCode != ''">
and org_code = #{orgCode}
</if>
--
Gitblit v1.9.3