From 9ca45195f78b74e9181cbbe7e82eb683ee49fabf Mon Sep 17 00:00:00 2001
From: liu <2021943741@qq.com>
Date: 星期五, 30 十月 2026 17:54:15 +0800
Subject: [PATCH] 质量管理模块:指标按产品/类别/工序维护与绑定、不合格处理方式、检验提交入库判定

---
 src/main/resources/mapper/quality/QualityTestStandardParamMapper.xml |   28 +++++++++++++++++++++++++---
 1 files changed, 25 insertions(+), 3 deletions(-)

diff --git a/src/main/resources/mapper/quality/QualityTestStandardParamMapper.xml b/src/main/resources/mapper/quality/QualityTestStandardParamMapper.xml
index 837bc26..31245c6 100644
--- a/src/main/resources/mapper/quality/QualityTestStandardParamMapper.xml
+++ b/src/main/resources/mapper/quality/QualityTestStandardParamMapper.xml
@@ -18,10 +18,32 @@
         <result column="default_value" property="defaultValue" />
     </resultMap>
     <select id="selectListByProductId" resultType="com.ruoyi.quality.pojo.QualityTestStandardParam">
-        select t1.* from quality_test_standard_param t1
-        left join quality_test_standard t2 on t1.test_standard_id = t2.id
-        left join quality_test_standard_binding t3 on t2.id = t3.test_standard_id
+        select distinct t1.* from quality_test_standard_param t1
+        inner join quality_test_standard t2 on t1.test_standard_id = t2.id
+        inner join quality_test_standard_binding t3 on t2.id = t3.test_standard_id
+        left join product_process pp on t2.process_id = pp.id
         where t3.product_id = #{productId}
+        <if test="inspectType != null">
+            and t2.inspect_type = #{inspectType}
+        </if>
+        <if test="process != null and process != ''">
+            and pp.name = #{process}
+        </if>
+        order by t1.id desc
+    </select>
+
+    <select id="selectPageByProductId" resultType="com.ruoyi.quality.pojo.QualityTestStandardParam">
+        select distinct t1.* from quality_test_standard_param t1
+        inner join quality_test_standard t2 on t1.test_standard_id = t2.id
+        inner join quality_test_standard_binding t3 on t1.test_standard_id = t3.test_standard_id
+        where t3.product_id = #{productId}
+        <if test="inspectType != null">
+            and t2.inspect_type = #{inspectType}
+        </if>
+        <if test="processId != null">
+            and t2.process_id = #{processId}
+        </if>
+        order by t1.id desc
     </select>
 
 </mapper>

--
Gitblit v1.9.3