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/SealUsageLedgerMapper.xml | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/inspect-server/src/main/resources/mapper/SealUsageLedgerMapper.xml b/inspect-server/src/main/resources/mapper/SealUsageLedgerMapper.xml
index d27e385..9d22b7c 100644
--- a/inspect-server/src/main/resources/mapper/SealUsageLedgerMapper.xml
+++ b/inspect-server/src/main/resources/mapper/SealUsageLedgerMapper.xml
@@ -5,7 +5,7 @@
<sql id="LedgerColumns">
ledger.id, ledger.report_id, ledger.report_code, ledger.ins_order_id,
ledger.use_time, ledger.seal_ids, ledger.seal_names,
- COALESCE(io.sample_view, '') AS project_name,
+ COALESCE(io.sample_view, '') AS project_name, io.sample_date,
ledger.use_user_id, ledger.use_user_name, ledger.copies, ledger.version,
ledger.create_user, ledger.create_time, ledger.update_user, ledger.update_time
</sql>
@@ -39,7 +39,7 @@
LEFT JOIN ins_order io ON io.id = ledger.ins_order_id
WHERE 1 = 1
<include refid="LedgerFilters"/>
- ORDER BY ledger.use_time DESC, ledger.id DESC
+ ORDER BY (io.sample_date IS NULL) ASC, io.sample_date DESC, io.id DESC, ledger.id DESC
</select>
<select id="selectForExport" resultType="com.ruoyi.inspect.pojo.SealUsageLedger">
--
Gitblit v1.9.3