From 7e8edd4b59fb22146b90d01ca38f75148f3fd774 Mon Sep 17 00:00:00 2001
From: liding <756868258@qq.com>
Date: 星期一, 20 四月 2026 17:57:18 +0800
Subject: [PATCH] feat(bom): 添加BOM管理功能模块,工序 管理,基础 - 新增CustomerPrivatePoolMapper.xml实现客户私池映射 - 添加SysLoginController支持登录验证和用户信息获取 - 创建TechnologyBomController提供BOM的增删改查接口 - 定义TechnologyBomDto数据传输对象 - 实现TechnologyBomMapper和相关XML映射文件 - 开发TechnologyBomService业务逻辑层 - 添加TechnologyBomStructure结构管理功能 - 集成Excel导入导出BOM数据功能 - 实现BOM结构树形展示和维护功能

---
 src/main/resources/mapper/quality/QualityUnqualifiedMapper.xml |   75 ++++++++++++++++++++++++++++++++++---
 1 files changed, 69 insertions(+), 6 deletions(-)

diff --git a/src/main/resources/mapper/quality/QualityUnqualifiedMapper.xml b/src/main/resources/mapper/quality/QualityUnqualifiedMapper.xml
index 61957ac..5bda4f6 100644
--- a/src/main/resources/mapper/quality/QualityUnqualifiedMapper.xml
+++ b/src/main/resources/mapper/quality/QualityUnqualifiedMapper.xml
@@ -3,18 +3,45 @@
 <mapper namespace="com.ruoyi.quality.mapper.QualityUnqualifiedMapper">
     <select id="qualityUnqualifiedListPage" resultType="com.ruoyi.quality.pojo.QualityUnqualified">
         SELECT
-        *
-        FROM quality_unqualified
+        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
         1=1
-        <if test="qualityUnqualified.inspectType != null and qualityUnqualified.inspectType != '' ">
+        <if test="qualityUnqualified.inspectType != null ">
             AND inspect_type = #{qualityUnqualified.inspectType}
         </if>
-        <if test="qualityUnqualified.inspectState != null and qualityUnqualified.inspectState != '' ">
+        <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>
     </select>
     <select id="qualityUnqualifiedExport" resultType="com.ruoyi.quality.pojo.QualityUnqualified">
@@ -23,14 +50,50 @@
         FROM quality_unqualified
         where
         1=1
-        <if test="qualityUnqualified.inspectType != null and qualityUnqualified.inspectType != '' ">
+        <if test="qualityUnqualified.inspectType != null">
             AND inspect_type = #{qualityUnqualified.inspectType}
         </if>
-        <if test="qualityUnqualified.inspectState != null and qualityUnqualified.inspectState != '' ">
+        <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>
     </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.model = 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