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/InsReportMapper.xml | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/inspect-server/src/main/resources/mapper/InsReportMapper.xml b/inspect-server/src/main/resources/mapper/InsReportMapper.xml
index ffd96ba..21e35bb 100644
--- a/inspect-server/src/main/resources/mapper/InsReportMapper.xml
+++ b/inspect-server/src/main/resources/mapper/InsReportMapper.xml
@@ -10,6 +10,7 @@
select
ir.*,
io.entrust_code,
+ io.sample_date,
u.name write_user_name,
u1.name ratify_user,
u2.name examine_user,
@@ -59,7 +60,7 @@
<if test="ew.customSqlSegment != null and ew.customSqlSegment != ''">
${ew.customSqlSegment}
</if>
- ORDER BY a.create_time DESC
+ ORDER BY (a.sample_date IS NULL) ASC, a.sample_date DESC, a.ins_order_id DESC, a.id DESC
</select>
<select id="getLaboratoryByName" resultType="java.lang.String">
select s.address from seal s
--
Gitblit v1.9.3