From bf233b9eeb959091831bf0b9a11a180fee2b2d51 Mon Sep 17 00:00:00 2001
From: Crunchy <3114200645@qq.com>
Date: 星期五, 09 八月 2024 18:44:49 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
inspect-server/src/main/resources/mapper/InsReportMapper.xml | 12 ++++++++----
1 files changed, 8 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..a208daa 100644
--- a/inspect-server/src/main/resources/mapper/InsReportMapper.xml
+++ b/inspect-server/src/main/resources/mapper/InsReportMapper.xml
@@ -23,23 +23,27 @@
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
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
+ 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