From 2016c6f7ff0def562d98472ad54013567efe2b73 Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期三, 10 六月 2026 15:28:56 +0800
Subject: [PATCH] feat(approve): 添加审批实例ID精确查询条件

---
 src/main/resources/mapper/quality/QualityUnqualifiedMapper.xml |   96 ++++++++++++++++++++++++++++++++++++++---------
 1 files changed, 77 insertions(+), 19 deletions(-)

diff --git a/src/main/resources/mapper/quality/QualityUnqualifiedMapper.xml b/src/main/resources/mapper/quality/QualityUnqualifiedMapper.xml
index b15e3f9..d995258 100644
--- a/src/main/resources/mapper/quality/QualityUnqualifiedMapper.xml
+++ b/src/main/resources/mapper/quality/QualityUnqualifiedMapper.xml
@@ -3,25 +3,47 @@
 <mapper namespace="com.ruoyi.quality.mapper.QualityUnqualifiedMapper">
     <select id="qualityUnqualifiedListPage" resultType="com.ruoyi.quality.pojo.QualityUnqualified">
         SELECT
-        *
-        FROM quality_unqualified
-        where
-        1=1
-        <if test="qualityUnqualified.inspectType != null ">
-            AND inspect_type = #{qualityUnqualified.inspectType}
-        </if>
-        <if test="qualityUnqualified.inspectState != null ">
-            AND inspect_state = #{qualityUnqualified.inspectState}
-        </if>
-        <if test="qualityUnqualified.productName != null and qualityUnqualified.productName != '' ">
-            AND product_name = #{qualityUnqualified.productName}
-        </if>
-        <if test="qualityUnqualified.entryDateStart != null and qualityUnqualified.entryDateStart != '' ">
-            AND check_time &gt;= DATE_FORMAT(#{qualityUnqualified.entryDateStart},'%Y-%m-%d')
-        </if>
-        <if test="qualityUnqualified.entryDateEnd != null and qualityUnqualified.entryDateEnd != '' ">
-            AND  check_time &lt;= DATE_FORMAT(#{qualityUnqualified.entryDateEnd},'%Y-%m-%d')
-        </if>
+        qu.id,
+        qu.inspect_type,
+        qu.inspect_state,
+        qu.check_time,
+        qu.check_name,
+        qu.product_id,
+        qu.product_name,
+        qu.unit,
+        qu.quantity,
+        qu.defective_phenomena,
+        qu.deal_result,
+        qu.deal_name,
+        qu.deal_time,
+        CASE
+        WHEN qu.model = pm.id THEN pm.model
+        ELSE qu.model
+        END AS model,
+        CASE
+        WHEN qu.model = pm.id THEN true
+        ELSE false
+        END AS method
+        FROM quality_unqualified qu
+        LEFT JOIN product_model pm ON qu.model = pm.id
+        <where>
+            <if test="qualityUnqualified.inspectType != null ">
+                AND inspect_type = #{qualityUnqualified.inspectType}
+            </if>
+            <if test="qualityUnqualified.inspectState != null ">
+                AND inspect_state = #{qualityUnqualified.inspectState}
+            </if>
+            <if test="qualityUnqualified.productName != null and qualityUnqualified.productName != '' ">
+                AND product_name = #{qualityUnqualified.productName}
+            </if>
+            <if test="qualityUnqualified.entryDateStart != null and qualityUnqualified.entryDateStart != '' ">
+                AND check_time &gt;= DATE_FORMAT(#{qualityUnqualified.entryDateStart},'%Y-%m-%d')
+            </if>
+            <if test="qualityUnqualified.entryDateEnd != null and qualityUnqualified.entryDateEnd != '' ">
+                AND  check_time &lt;= DATE_FORMAT(#{qualityUnqualified.entryDateEnd},'%Y-%m-%d')
+            </if>
+        </where>
+        order by qu.create_time desc
     </select>
     <select id="qualityUnqualifiedExport" resultType="com.ruoyi.quality.pojo.QualityUnqualified">
         SELECT
@@ -39,4 +61,40 @@
             AND product_name = #{qualityUnqualified.productName}
         </if>
     </select>
+    <select id="getUnqualified" resultType="com.ruoyi.quality.pojo.QualityUnqualified">
+        SELECT
+            qu.id,
+            qu.inspect_type,
+            qu.inspect_state,
+            qu.check_time,
+            qu.check_name,
+            qu.product_id,
+            qu.product_name,
+            qu.unit,
+            qu.quantity,
+            qu.defective_phenomena,
+            qu.deal_result,
+            qu.deal_name,
+            qu.deal_time,
+            CASE
+                WHEN qu.model = pm.id THEN pm.model
+                ELSE qu.model
+                END AS model,
+            CASE
+                WHEN qu.model = pm.id THEN true
+                ELSE false
+                END AS method
+        FROM quality_unqualified qu
+                 LEFT JOIN product_model pm ON qu.product_model_id = pm.id
+        where
+            1=1
+        and qu.id = #{id}
+    </select>
+    <select id="getModelId" resultType="java.lang.Long">
+        select pm.id
+        from product_model pm
+        left join product p on pm.product_id=p.id
+        where pm.model=#{model}
+          and  p.product_name=#{productName}
+    </select>
 </mapper>

--
Gitblit v1.9.3