From 1b02862f56fc90459088a7850b1cbc66686ea29e Mon Sep 17 00:00:00 2001
From: liding <756868258@qq.com>
Date: 星期五, 30 十月 2026 16:45:12 +0800
Subject: [PATCH] feat(order): 新增委托单级联删除服务 - 新增 InsOrderDeletionService，实现委托单及全部关联业务记录的级联删除 - 重构删除接口，增加权限校验和操作日志注解 - 委托单、报告、样品、样品接收、用章台账、过程报告等模块统一增加送样日期字段并按送样日期排序 - 委托单新增时校验送样日期不能为空 - 优化角色菜单权限，新增
---
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