From 5f73eb1fb9d04040fe6ba377d5ae582024429f2f Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期日, 20 九月 2026 14:15:02 +0800
Subject: [PATCH] feat(sales): 添加客户交易详情中的付款金额字段
---
src/main/java/com/ruoyi/collaborativeApproval/service/impl/MeetingServiceImpl.java | 65 ++++++++++++++++++++------------
1 files changed, 41 insertions(+), 24 deletions(-)
diff --git a/src/main/java/com/ruoyi/collaborativeApproval/service/impl/MeetingServiceImpl.java b/src/main/java/com/ruoyi/collaborativeApproval/service/impl/MeetingServiceImpl.java
index 636130a..5390854 100644
--- a/src/main/java/com/ruoyi/collaborativeApproval/service/impl/MeetingServiceImpl.java
+++ b/src/main/java/com/ruoyi/collaborativeApproval/service/impl/MeetingServiceImpl.java
@@ -173,28 +173,7 @@
//鍙備細浜哄憳id(浜哄憳鍙拌处鍜岀敤鎴疯〃閫氳繃浜哄憳缂栧彿鍜岀敤鎴峰悕绉�(鐧诲綍璐﹀彿)鍋氬尮閰�)
if (Integer.valueOf(1).equals(meetApplication.getPublishStatus())) {
MeetApplication application = meetApplicationMapper.selectById(meetApplication.getId());
-
- String cleanStr = application.getParticipants()
- .replaceAll("^\\[|\\]$", "")
- .trim();
-
- List<Long> userIds = Arrays.stream(cleanStr.split(","))
- .map(String::trim)
- .filter(s -> !s.isEmpty())
- .map(Long::valueOf)
- .map(staffId -> {
- StaffOnJob record = staffOnJobMapper.selectById(staffId);
- if (record == null) {
- return null;
- }
- return userMapper.selectOne(
- Wrappers.<SysUser>lambdaQuery()
- .eq(SysUser::getUserName, record.getStaffNo())
- );
- })
- .filter(Objects::nonNull)
- .map(SysUser::getUserId)
- .collect(Collectors.toList());
+ List<Long> userIds = resolveParticipantUserIds(application.getParticipants());
if (!userIds.isEmpty()) {
sysNoticeService.simpleNoticeByUser(
@@ -209,6 +188,44 @@
}
return R.ok();
+ }
+
+ // 鍙備細浜哄憳鍙拌处id -> 鐧诲綍鐢ㄦ埛id锛涘悓涓�鐧诲綍璐﹀彿鍦� sys_user 瀛樺湪澶氭潯鍘嗗彶璁板綍鏃讹紝鎸夋湭鍒犻櫎浼樺厛鍙栦竴鏉★紝閬垮厤 selectOne 鎶� TooManyResultsException
+ private List<Long> resolveParticipantUserIds(String participants) {
+ if (StrUtil.isBlank(participants)) {
+ return Collections.emptyList();
+ }
+ String cleanStr = participants.replaceAll("^\\[|\\]$", "").trim();
+ if (cleanStr.isEmpty()) {
+ return Collections.emptyList();
+ }
+ List<Long> staffIds = Arrays.stream(cleanStr.split(","))
+ .map(String::trim)
+ .filter(s -> !s.isEmpty())
+ .map(Long::valueOf)
+ .collect(Collectors.toList());
+ if (staffIds.isEmpty()) {
+ return Collections.emptyList();
+ }
+ List<String> loginNames = staffOnJobMapper.selectBatchIds(staffIds).stream()
+ .map(StaffOnJob::getStaffNo)
+ .filter(StrUtil::isNotBlank)
+ .distinct()
+ .collect(Collectors.toList());
+ if (loginNames.isEmpty()) {
+ return Collections.emptyList();
+ }
+ return userMapper.selectList(Wrappers.<SysUser>lambdaQuery()
+ .in(SysUser::getUserName, loginNames)
+ .orderByAsc(SysUser::getDelFlag)
+ .orderByAsc(SysUser::getUserId))
+ .stream()
+ .collect(Collectors.toMap(SysUser::getUserName, SysUser::getUserId,
+ (first, ignored) -> first, LinkedHashMap::new))
+ .values()
+ .stream()
+ .distinct()
+ .collect(Collectors.toList());
}
@Override
@@ -238,9 +255,9 @@
.or()
.eq(MeetApplication::getApplicationType, "notification");
});
- if (Objects.nonNull(vo.getMeetingDate())) {
+ if (Objects.nonNull(vo.getDate())) {
alWrapper.and(wrapper -> {
- wrapper.eq(MeetApplication::getMeetingDate, vo.getMeetingDate());
+ wrapper.eq(MeetApplication::getMeetingDate, vo.getDate());
});
}
alWrapper.orderByAsc(MeetApplication::getStartTime);
--
Gitblit v1.9.3