From 3d3477dc4a070a48e21f1625914f55a321a6c096 Mon Sep 17 00:00:00 2001
From: dy <dingyang@lnfxkj.tech>
Date: 星期三, 16 四月 2025 19:37:48 +0800
Subject: [PATCH] 焊缝统计图提交

---
 aps-modules/aps-core/src/main/resources/mapper/core/ApsWeldSeamMapper.xml |   13 +++----------
 1 files changed, 3 insertions(+), 10 deletions(-)

diff --git a/aps-modules/aps-core/src/main/resources/mapper/core/ApsWeldSeamMapper.xml b/aps-modules/aps-core/src/main/resources/mapper/core/ApsWeldSeamMapper.xml
index dfd139d..5770b88 100644
--- a/aps-modules/aps-core/src/main/resources/mapper/core/ApsWeldSeamMapper.xml
+++ b/aps-modules/aps-core/src/main/resources/mapper/core/ApsWeldSeamMapper.xml
@@ -184,16 +184,9 @@
             AND classification.dict_type = 'aps_weld_classification'
             <where>
                 seam.del_flag = '0'
-                <if test="produceYears != null "> and produce_year in
-                    <foreach item="produceYear" collection="produceYears" open="(" separator="," close=")">
-                        #{produceYear}
-                    </foreach>
-                </if>
-                <if test="produceMonths != null "> and produce_month in
-                    <foreach item="produceMonth" collection="produceMonths" open="(" separator="," close=")">
-                        #{produceMonth}
-                    </foreach>
-                </if>
+                <foreach item="item" index="index" collection="list" separator=" OR " open="and (" close=") ">
+                    produce_year = #{item.produceYear} and produce_month = #{item.produceMonth}
+                </foreach>
             </where>
         GROUP BY
             seam.produce_year,

--
Gitblit v1.9.3