From 18fd6957fcbcd6e798b737a08d7c62cf58dad881 Mon Sep 17 00:00:00 2001
From: zouyu <2723363702@qq.com>
Date: 星期二, 13 八月 2024 14:34:48 +0800
Subject: [PATCH] 检验任务:任务切换sql调整

---
 inspect-server/src/main/resources/mapper/InsReportMapper.xml |   16 ++++++++++++++--
 1 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/inspect-server/src/main/resources/mapper/InsReportMapper.xml b/inspect-server/src/main/resources/mapper/InsReportMapper.xml
index a7b3143..a208daa 100644
--- a/inspect-server/src/main/resources/mapper/InsReportMapper.xml
+++ b/inspect-server/src/main/resources/mapper/InsReportMapper.xml
@@ -23,15 +23,27 @@
         select *
         from (
         select
-        ir.*,io.entrust_code,u.name update_user_name,u1.name ratify_user,u2.name examine_user
+        ir.*,io.entrust_code,u.name write_user_name,u1.name ratify_user,u2.name examine_user,io.laboratory
         from ins_report ir
         left join ins_order io on io.id = ir.ins_order_id
-        left join user u on u.id = ir.update_user
+        left join user u on u.id = ir.write_user_id
         left join user u1 on u1.id = ir.ratify_user_id
         left join user u2 on u2.id = ir.examine_user_id
+        where 1=1
+        <if test="laboratory!=null and laboratory!=''">
+           and  laboratory=#{laboratory}
+        </if>
         ) a
         <if test="ew.customSqlSegment != null and ew.customSqlSegment != ''">
             ${ew.customSqlSegment}
         </if>
     </select>
+    <select id="getLaboratoryByName" resultType="java.lang.String">
+        select s.address from seal s
+        left join laboratory l on s.lab_id = l.id
+        where l.laboratory_name = #{name}
+        and s.type = '鎶ュ憡绫诲瀷'
+        order by s.create_time desc
+        limit 1
+    </select>
 </mapper>

--
Gitblit v1.9.3