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/InsOrderMapper.xml | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/inspect-server/src/main/resources/mapper/InsOrderMapper.xml b/inspect-server/src/main/resources/mapper/InsOrderMapper.xml
index dfa7c0d..2014b1f 100644
--- a/inspect-server/src/main/resources/mapper/InsOrderMapper.xml
+++ b/inspect-server/src/main/resources/mapper/InsOrderMapper.xml
@@ -202,11 +202,12 @@
AND io.laboratory=#{laboratory}
</if>
GROUP BY io.id,type
- order by type desc,io.id desc
+ order by (io.sample_date is null) asc, io.sample_date desc, io.id desc
) a
<if test="ew.customSqlSegment != null and ew.customSqlSegment != ''">
${ew.customSqlSegment}
</if>
+ ORDER BY (a.sample_date IS NULL) ASC, a.sample_date DESC, a.id DESC
</select>
<select id="selectInsOrderParameter" resultType="com.ruoyi.inspect.pojo.InsOrder">
--
Gitblit v1.9.3