From 04dce61c02c10832665cdaf1aabf5b7e9b31da47 Mon Sep 17 00:00:00 2001
From: liyong <18434998025@163.com>
Date: 星期三, 21 一月 2026 16:17:19 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_New' into dev_New
---
src/main/resources/mapper/quality/QualityTestStandardMapper.xml | 16 ++++++++++++++--
1 files changed, 14 insertions(+), 2 deletions(-)
diff --git a/src/main/resources/mapper/quality/QualityTestStandardMapper.xml b/src/main/resources/mapper/quality/QualityTestStandardMapper.xml
index be07a98..b9ad8ed 100644
--- a/src/main/resources/mapper/quality/QualityTestStandardMapper.xml
+++ b/src/main/resources/mapper/quality/QualityTestStandardMapper.xml
@@ -14,10 +14,22 @@
AND standard_name like concat('%',#{c.standardName},'%')
</if>
<if test="c.state != null and c.state != '' ">
- AND state = #{c.state}
+ AND state =#{c.state}
</if>
<if test="c.inspectType != null and c.inspectType != '' ">
- AND inspect_type = #{c.inspectType}
+ AND inspect_type =#{c.inspectType}
</if>
</select>
+ <select id="getQualityTestStandardByProductId" resultType="com.ruoyi.quality.pojo.QualityTestStandard">
+ SELECT qts.*
+ FROM quality_test_standard qts
+ left join quality_test_standard_binding qtsb on qtsb.test_standard_id = qts.id
+ left join product_process pp on qts.process_id = pp.id
+ WHERE qtsb.product_id = #{productId}
+ AND qts.inspect_type = #{inspectType}
+ <if test="process!='' and process!=null">
+ and pp.name = #{process}
+ </if>
+ order by qts.id desc
+ </select>
</mapper>
--
Gitblit v1.9.3