From db1be72e80a9532ceda5000d79c153eb859caa05 Mon Sep 17 00:00:00 2001
From: bluejay <253316343@qq.com>
Date: 星期一, 14 四月 2025 16:46:22 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
aps-modules/aps-core/src/main/resources/mapper/core/ApsWeldSeamStatisticsMapper.xml | 12 +-----------
1 files changed, 1 insertions(+), 11 deletions(-)
diff --git a/aps-modules/aps-core/src/main/resources/mapper/core/ApsWeldSeamStatisticsMapper.xml b/aps-modules/aps-core/src/main/resources/mapper/core/ApsWeldSeamStatisticsMapper.xml
index 0fa48b1..a8d82c3 100644
--- a/aps-modules/aps-core/src/main/resources/mapper/core/ApsWeldSeamStatisticsMapper.xml
+++ b/aps-modules/aps-core/src/main/resources/mapper/core/ApsWeldSeamStatisticsMapper.xml
@@ -35,17 +35,7 @@
<where>
<if test="params.beginYear != null and params.beginYear != '' and params.endYear != null and params.endYear != ''"> and year between #{params.beginYear} and #{params.endYear}</if>
<if test="params.beginMonth != null and params.beginMonth != '' and params.endMonth != null and params.endMonth != ''"> and month between #{params.beginMonth} and #{params.endMonth}</if>
- <if test="productionBase != null and productionBase != ''"> and production_base like concat('%', #{productionBase}, '%')</if>
- <if test="pipingOrderRequirement != null "> and piping_order_requirement = #{pipingOrderRequirement}</if>
- <if test="gasOrderRequirement != null "> and gas_order_requirement = #{gasOrderRequirement}</if>
- <if test="pipingPredictionRequirement != null "> and piping_prediction_requirement = #{pipingPredictionRequirement}</if>
- <if test="gasPredictionRequirement != null "> and gas_prediction_requirement = #{gasPredictionRequirement}</if>
- <if test="reserveEmergencyOrderOutput != null "> and reserve_emergency_order_output = #{reserveEmergencyOrderOutput}</if>
- <if test="total != null "> and total = #{total}</if>
- <if test="days != null "> and days = #{days}</if>
- <if test="requirementDayWeldSeam != null "> and requirement_day_weld_seam = #{requirementDayWeldSeam}</if>
- <if test="productionDayWeldSeam != null "> and production_day_weld_seam = #{productionDayWeldSeam}</if>
- <if test="isSatisfy != null and isSatisfy != ''"> and is_satisfy = #{isSatisfy}</if>
+ <if test="productionBase != null and productionBase != ''"> and production_base like '%'|| #{productionBase}|| '%'</if>
</where>
</select>
--
Gitblit v1.9.3