From 563b227acc04b19406cc4592f5db29b8110f2794 Mon Sep 17 00:00:00 2001
From: hongjli <3117313295@qq.com>
Date: 星期五, 23 五月 2025 13:02:36 +0800
Subject: [PATCH] 设计产能从产能规划中取值时取消对major的过滤
---
aps-modules/aps-core/src/main/java/com/aps/core/service/impl/ApsGasPipingRouteStatServiceImpl.java | 8 ++++----
aps-modules/aps-core/src/main/resources/mapper/core/ApsGasPipelineCapacityPlanMapper.xml | 3 ---
2 files changed, 4 insertions(+), 7 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 49878d5..d01e96b 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
@@ -1690,9 +1690,9 @@
capacityPlans = capacityPlanCache.get(cacheKey);
} else {
// 浣跨敤涓撶敤鏌ヨ鏂规硶鏌ヨ璁捐浜ц兘鏁版嵁
- // 鎸夋枃妗ｈ姹傦細鏍规嵁澶氫釜process_name鍜宮ajor銆乸lant鍘籥ps_gas_pipeline_capacity_plan琛ㄤ腑鏌ヨ
+ // 鎸夋枃妗ｈ姹傦細鏍规嵁process_name鍜宲lant鍘籥ps_gas_pipeline_capacity_plan琛ㄤ腑鏌ヨ
capacityPlans = apsGasPipelineCapacityPlanMapper.selectDesignCapacityForInterface2(
- processName.trim(), year, month, major, plant);
+ processName.trim(), year, month, null, plant);
// 灏嗙粨鏋滃瓨鍏ョ紦瀛�
capacityPlanCache.put(cacheKey, capacityPlans);
@@ -1757,9 +1757,9 @@
capacityPlans = capacityPlanCache.get(cacheKey);
} else {
// 浣跨敤涓撶敤鏌ヨ鏂规硶鏌ヨ璁捐浜ц兘鏁版嵁
- // 鎸夋枃妗ｈ姹傦細鏍规嵁process_name銆乵ajor銆乸lant鍘籥ps_gas_pipeline_capacity_plan琛ㄤ腑鏌ヨ
+ // 鎸夋枃妗ｈ姹傦細鏍规嵁process_name鍜宲lant鍘籥ps_gas_pipeline_capacity_plan琛ㄤ腑鏌ヨ
capacityPlans = apsGasPipelineCapacityPlanMapper.selectDesignCapacityForInterface2(
- processName, year, month, major, plant);
+ processName, year, month, null, 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 9cf0dc8..b41970a 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,9 +160,6 @@
<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