From 187929a838f5cd672e43cfc027cd8790e2c45a8d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9B=B9=E9=B9=8F=E9=A3=9E?= Date: Tue, 21 Apr 2026 17:50:10 +0800 Subject: [PATCH] =?UTF-8?q?feat(service):=20=E6=96=B0=E5=A2=9E=E8=B4=A8?= =?UTF-8?q?=E9=87=8F=E9=80=9A=E7=9F=A5=E4=B8=9A=E5=8A=A1=E9=80=BB=E8=BE=91?= =?UTF-8?q?=E5=AE=9E=E7=8E=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 实现质量通知的新增，支持手动选择用户和附件上传 - 实现质量通知编辑，支持用户和附件的更新与维护 - 实现质量通知删除，删除通知及其关联用户和附件 - 实现分页查询质量通知列表并进行名称翻译 - 实现质量通知详情查询，包括通知内容、用户列表及附件 - 添加启用/禁用质量通知功能，支持状态更新和日志记录 - 添加私有方法保存通知用户关联，确保数据一致性 - 添加私有方法翻译通知目标类型和启用状态为易读名称 --- .../QualityNotificationControllerService.java | 29 +++++++++++++++++++ 1 file changed, 29 insertions(+) diff --git a/nflg-qms-admin/src/main/java/com/nflg/qms/admin/service/QualityNotificationControllerService.java b/nflg-qms-admin/src/main/java/com/nflg/qms/admin/service/QualityNotificationControllerService.java index 084cf078..81781746 100644 --- a/nflg-qms-admin/src/main/java/com/nflg/qms/admin/service/QualityNotificationControllerService.java +++ b/nflg-qms-admin/src/main/java/com/nflg/qms/admin/service/QualityNotificationControllerService.java @@ -275,6 +275,35 @@ public class QualityNotificationControllerService { // 通知对象类型名称 if (vo.getTargetType() != null) { vo.setTargetTypeName(vo.getTargetType() == 1 ? "全部" : "手动选择"); + if (vo.getTargetType() == 2) { + List users = notificationUserService.lambdaQuery() + .eq(QmsQualityNotificationUser::getNotificationId, vo.getId()) + .list(); + if (CollectionUtil.isNotEmpty(users)) { + List userIds = users.stream() + .map(QmsQualityNotificationUser::getUserId) + .collect(Collectors.toList()); + List userList = userService.listByIds(userIds); + + List userVOs = new ArrayList<>(); + for (QmsQualityNotificationUser nu : users) { + User user = userList.stream() + .filter(u -> u.getId().equals(nu.getUserId())) + .findFirst() + .orElse(null); + if (user != null) { + QmsQualityNotificationUserVO userVO = new QmsQualityNotificationUserVO(); + userVO.setId(nu.getId()); + userVO.setNotificationId(nu.getNotificationId()); + userVO.setUserId(nu.getUserId()); + userVO.setUserName(user.getUserName()); + userVO.setUserCode(user.getUserCode()); + userVOs.add(userVO); + } + } + vo.setUsers(userVOs); + } + } } // 启用状态名称 if (vo.getEnable() != null) {