From 1c52e77d77d0e924a1df0725c0748afde172ad68 Mon Sep 17 00:00:00 2001
From: 吴羡 <16976746+Xian-TT3@user.noreply.gitee.com>
Date: 星期五, 30 十月 2026 16:51:08 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
inspect-server/src/main/resources/mapper/InsReportMapper.xml | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/inspect-server/src/main/resources/mapper/InsReportMapper.xml b/inspect-server/src/main/resources/mapper/InsReportMapper.xml
index ffd96ba..21e35bb 100644
--- a/inspect-server/src/main/resources/mapper/InsReportMapper.xml
+++ b/inspect-server/src/main/resources/mapper/InsReportMapper.xml
@@ -10,6 +10,7 @@
select
ir.*,
io.entrust_code,
+ io.sample_date,
u.name write_user_name,
u1.name ratify_user,
u2.name examine_user,
@@ -59,7 +60,7 @@
<if test="ew.customSqlSegment != null and ew.customSqlSegment != ''">
${ew.customSqlSegment}
</if>
- ORDER BY a.create_time DESC
+ ORDER BY (a.sample_date IS NULL) ASC, a.sample_date DESC, a.ins_order_id DESC, a.id DESC
</select>
<select id="getLaboratoryByName" resultType="java.lang.String">
select s.address from seal s
--
Gitblit v1.9.3