From e8d0a2f9375da4d04da4a06a0f9fa8ef448512c4 Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期二, 19 十一月 2024 15:58:49 +0800
Subject: [PATCH] 检验下单审核进行企业微信推送

---
 inspect-server/src/main/resources/mapper/InsReportMapper.xml |   13 +++++++++----
 1 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/inspect-server/src/main/resources/mapper/InsReportMapper.xml b/inspect-server/src/main/resources/mapper/InsReportMapper.xml
index d479c7c..3b0ce06 100644
--- a/inspect-server/src/main/resources/mapper/InsReportMapper.xml
+++ b/inspect-server/src/main/resources/mapper/InsReportMapper.xml
@@ -23,23 +23,28 @@
         select *
         from (
         select
-        ir.*,io.entrust_code,u.name write_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,l.id labId
         from ins_report ir
         left join ins_order io on io.id = ir.ins_order_id
         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
+        left join laboratory l on io.laboratory=laboratory_name
+        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 `center-lims`.seal s
-        left join `center-lims`.laboratory l on s.lab_id = l.id
+        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 l.create_time desc
+        order by s.create_time desc
         limit 1
     </select>
 </mapper>

--
Gitblit v1.9.3