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'
---
cnas-process/src/main/resources/mapper/ProcessReportMapper.xml | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/cnas-process/src/main/resources/mapper/ProcessReportMapper.xml b/cnas-process/src/main/resources/mapper/ProcessReportMapper.xml
index a9fd8c4..97a3e86 100644
--- a/cnas-process/src/main/resources/mapper/ProcessReportMapper.xml
+++ b/cnas-process/src/main/resources/mapper/ProcessReportMapper.xml
@@ -35,6 +35,7 @@
cpr.update_user,
cpr.update_time,
cpr.inspection_order_id,
+ io.sample_date,
cpr.receive_date,
cpr.receive_user,
u1.name sendUserName
@@ -47,7 +48,7 @@
<if test="ew.customSqlSegment != null and ew.customSqlSegment != ''">
${ew.customSqlSegment}
</if>
- order by A.send_time desc, A.id desc
+ order by (A.sample_date IS NULL) asc, A.sample_date desc, A.inspection_order_id desc, A.id desc
</select>
<select id="exportProcessReport" resultType="com.ruoyi.process.dto.ProcessReportDto">
select ROW_NUMBER() OVER (ORDER BY cpr.id) AS indexs,
--
Gitblit v1.9.3