From 3728fa293e1faf4bf4f9bf41105b84ddb43dc82e Mon Sep 17 00:00:00 2001
From: liding <756868258@qq.com>
Date: 星期一, 02 十一月 2026 16:53:02 +0800
Subject: [PATCH] feat(order-rates): 新增筛选条件下全部订单费用汇总接口
---
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