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，实现委托单及全部关联业务记录的级联删除 - 重构删除接口，增加权限校验和操作日志注解 - 委托单、报告、样品、样品接收、用章台账、过程报告等模块统一增加送样日期字段并按送样日期排序 - 委托单新增时校验送样日期不能为空 - 优化角色菜单权限，新增
---
cnas-process/src/main/java/com/ruoyi/process/task/QualitySuperviseSchedule.java | 5 +++--
1 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/cnas-process/src/main/java/com/ruoyi/process/task/QualitySuperviseSchedule.java b/cnas-process/src/main/java/com/ruoyi/process/task/QualitySuperviseSchedule.java
index 0d42e19..385b8a6 100644
--- a/cnas-process/src/main/java/com/ruoyi/process/task/QualitySuperviseSchedule.java
+++ b/cnas-process/src/main/java/com/ruoyi/process/task/QualitySuperviseSchedule.java
@@ -91,8 +91,9 @@
List<QualitySuperviseDetails> qualitySuperviseDetails = qualitySuperviseDetailsMapper.selectList(Wrappers.<QualitySuperviseDetails>lambdaQuery()
.eq(QualitySuperviseDetails::getSuperviseTime, format));
- // 鏍规嵁瀹氭湡鐩戠潱鍜屽姩鎬佺洃鐫ｅ尯鍒�
- Map<String, List<QualitySuperviseDetails>> superviseReasonMap = qualitySuperviseDetails.stream().collect(Collectors.groupingBy(QualitySuperviseDetails::getSuperviseReason));
+ // 鏍规嵁鐩戠潱鍘熷洜鍖哄垎(瀹氭湡鐩戠潱/鍔ㄦ�佺洃鐫�), 鐩戠潱鍘熷洜鍏佽鎵嬪伐濉啓鎴栦负绌�, 杩欓噷鍋氱┖鍊煎厹搴�
+ Map<String, List<QualitySuperviseDetails>> superviseReasonMap = qualitySuperviseDetails.stream()
+ .collect(Collectors.groupingBy(details -> StrUtil.nullToEmpty(details.getSuperviseReason())));
// 鑾峰彇褰撴湀鏃ユ湡
DateTimeFormatter formatter2 = DateTimeFormatter.ofPattern("yyyy骞碝M鏈�");
--
Gitblit v1.9.3