From 970aaf7ecbe340bd687d33411ea716a5af2e271a Mon Sep 17 00:00:00 2001
From: huminmin <mac@MacBook-Pro.local>
Date: 星期五, 06 二月 2026 16:37:42 +0800
Subject: [PATCH] 工序,生产核算导出去掉工资和工时定额

---
 src/main/resources/mapper/quality/QualityTestStandardMapper.xml |   20 ++++++++++++++++----
 1 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/src/main/resources/mapper/quality/QualityTestStandardMapper.xml b/src/main/resources/mapper/quality/QualityTestStandardMapper.xml
index be07a98..5c20733 100644
--- a/src/main/resources/mapper/quality/QualityTestStandardMapper.xml
+++ b/src/main/resources/mapper/quality/QualityTestStandardMapper.xml
@@ -13,11 +13,23 @@
         <if test="c.standardName != null and c.standardName != '' ">
             AND standard_name like concat('%',#{c.standardName},'%')
         </if>
-        <if test="c.state != null and c.state != '' ">
-            AND state = #{c.state}
+        <if test="c.state != null ">
+            AND state =#{c.state}
         </if>
-        <if test="c.inspectType != null and c.inspectType != '' ">
-            AND inspect_type = #{c.inspectType}
+        <if test="c.inspectType != null ">
+            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