From efa726ed6de58fa810359cf4a3664184664a4ee6 Mon Sep 17 00:00:00 2001
From: huangjiayang <5265313@qq.com>
Date: 星期一, 28 四月 2025 18:30:09 +0800
Subject: [PATCH] 【UPDATE-BUGFIX】修改气柜管路产能统计查询条件BUG

---
 aps-modules/aps-core/src/main/resources/mapper/core/ApsGasPipelineCapacityPlanMapper.xml |    3 +++
 aps-modules/aps-core/src/main/resources/mapper/core/ApsGasPipingRouteStatMapper.xml      |    2 +-
 2 files changed, 4 insertions(+), 1 deletions(-)

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 284bd03..c5cc0cc 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
@@ -42,6 +42,9 @@
             <if test="dayProduceAllNum != null "> and day_produce_all_num = #{dayProduceAllNum}</if>
             <if test="days != null "> and days = #{days}</if>
             <if test="monthProduceAllNum != null "> and month_produce_all_num = #{monthProduceAllNum}</if>
+<!--            <if test="major != null and major != ''">-->
+<!--                and process_name in (select process_name from aps_standard_process where major=#{major})-->
+<!--            </if>-->
         </where>
     </select>
     
diff --git a/aps-modules/aps-core/src/main/resources/mapper/core/ApsGasPipingRouteStatMapper.xml b/aps-modules/aps-core/src/main/resources/mapper/core/ApsGasPipingRouteStatMapper.xml
index 94bcc48..90049f5 100644
--- a/aps-modules/aps-core/src/main/resources/mapper/core/ApsGasPipingRouteStatMapper.xml
+++ b/aps-modules/aps-core/src/main/resources/mapper/core/ApsGasPipingRouteStatMapper.xml
@@ -49,7 +49,7 @@
             <if test="planStartMonth != null and planStartMonth != ''"> and plan_start_month = #{planStartMonth} </if>
             <if test="planStartDay != null and planStartDay != ''"> and plan_start_day = #{planStartDay} </if>
             <if test="searchStartDate != null and searchStartDate != '' and searchEndDate != null and searchEndDate != ''"> and (process_plan_start_day &gt;= #{searchStartDate} and process_plan_start_day &lt;= #{searchEndDate}) </if>
-            <if test="major != null and major != '' and major == 'piping'">
+            <if test="major != null and major != ''">
                 <if test="major == 'piping'">
                     and process_name in (select process_name from aps_standard_process where major='绠¤矾')
                 </if>

--
Gitblit v1.9.3