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/InsSampleReceiptMapper.xml | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/inspect-server/src/main/resources/mapper/InsSampleReceiptMapper.xml b/inspect-server/src/main/resources/mapper/InsSampleReceiptMapper.xml
index 8dbe4e5..cc57cca 100644
--- a/inspect-server/src/main/resources/mapper/InsSampleReceiptMapper.xml
+++ b/inspect-server/src/main/resources/mapper/InsSampleReceiptMapper.xml
@@ -3,7 +3,7 @@
<mapper namespace="com.ruoyi.inspect.mapper.InsSampleReceiptMapper">
<sql id="receiptColumns">
r.id receipt_id, r.ins_order_id order_id, r.ins_sample_id sample_id, r.status,
- COALESCE(NULLIF(io.sample_view, ''), isa.sample) AS sample_name, isa.sample_code, io.entrust_code,
+ COALESCE(NULLIF(io.sample_view, ''), isa.sample) AS sample_name, isa.sample_code, io.entrust_code, io.sample_date,
COALESCE(iost.method_standard, sm.code) method_standard,
ip.inspection_item, r.main_inspector_id, u.name main_inspector_name,
COALESCE(isa.remark, io.remark) remark, r.reject_remark, r.receive_time,
@@ -43,7 +43,7 @@
LIKE CONCAT('%', #{query.sampleName}, '%')
</if>
GROUP BY r.id
- ORDER BY r.create_time DESC
+ ORDER BY (io.sample_date IS NULL) ASC, io.sample_date DESC, io.id DESC, r.id DESC
</select>
<select id="selectDetail" resultType="com.ruoyi.inspect.dto.SampleReceiptPageDto">
SELECT <include refid="receiptColumns"/>
--
Gitblit v1.9.3