From 8ce50189f0b00d62390d67fd27f859ca7831616b Mon Sep 17 00:00:00 2001
From: value <z1292839451@163.com>
Date: 星期四, 23 五月 2024 17:32:44 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
inspect-server/src/main/resources/mapper/InsReportMapper.xml | 12 ++++++++++--
1 files changed, 10 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..d479c7c 100644
--- a/inspect-server/src/main/resources/mapper/InsReportMapper.xml
+++ b/inspect-server/src/main/resources/mapper/InsReportMapper.xml
@@ -23,10 +23,10 @@
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
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
) a
@@ -34,4 +34,12 @@
${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
+ where l.laboratory_name = #{name}
+ and s.type = '鎶ュ憡绫诲瀷'
+ order by l.create_time desc
+ limit 1
+ </select>
</mapper>
--
Gitblit v1.9.3