From c8abec662e3c634365a9aeeda5c57e0f0e51cb41 Mon Sep 17 00:00:00 2001 From: zhanghl <253316343@qq.com> Date: 星期五, 23 五月 2025 16:44:31 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev --- aps-modules/aps-core/src/main/resources/mapper/core/ApsGasPipelineCapacityPlanMapper.xml | 3 +++ 1 files changed, 3 insertions(+), 0 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 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