From cb3ec598dc18e66b70a2cc9f7181c8be5bcf6e57 Mon Sep 17 00:00:00 2001
From: zhuo <2089219845@qq.com>
Date: 星期二, 01 四月 2025 08:50:16 +0800
Subject: [PATCH] 检验项预警非文字检验项都要预警

---
 inspect-server/src/main/resources/mapper/InsProductDeviationWarningMapper.xml |   11 +++++++----
 1 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/inspect-server/src/main/resources/mapper/InsProductDeviationWarningMapper.xml b/inspect-server/src/main/resources/mapper/InsProductDeviationWarningMapper.xml
index 26fa63d..24007fb 100644
--- a/inspect-server/src/main/resources/mapper/InsProductDeviationWarningMapper.xml
+++ b/inspect-server/src/main/resources/mapper/InsProductDeviationWarningMapper.xml
@@ -4,11 +4,14 @@
 
     <!-- 鏌ョ湅棰勮鍒楄〃 -->
     <select id="selectDeviationWarningPage" resultType="com.ruoyi.inspect.dto.InsProductDeviationWarningDto">
-        select * from (select ipdw.*,
-        isa.sample sample_name,
-        isa.model  sample_model
+        select *
+        from (select ipdw.*,
+        isa.sample                                              sample_name,
+        isa.model                                               sample_model,
+        concat(ip.inspection_item, ip.inspection_item_subclass) inspection_item_name
         from ins_product_deviation_warning ipdw
-        left join ins_sample isa on isa.id = ipdw.ins_sample_id) a
+        left join ins_sample isa on isa.id = ipdw.ins_sample_id
+        left join ins_product ip On ip.id = ipdw.ins_product_id) a
         <if test="ew.customSqlSegment != null and ew.customSqlSegment != ''">
             ${ew.customSqlSegment}
         </if>

--
Gitblit v1.9.3