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 | 96 ++++++++++++++++++++++++++++++++---------------
1 files changed, 65 insertions(+), 31 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 bef5926..5390854 100644
--- a/src/main/java/com/ruoyi/collaborativeApproval/service/impl/MeetingServiceImpl.java
+++ b/src/main/java/com/ruoyi/collaborativeApproval/service/impl/MeetingServiceImpl.java
@@ -3,7 +3,6 @@
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -25,16 +24,19 @@
import com.ruoyi.collaborativeApproval.vo.SearchMeetingDraftVo;
import com.ruoyi.collaborativeApproval.vo.SearchMeetingRoomVo;
import com.ruoyi.collaborativeApproval.vo.SearchMeetingUseVo;
+import com.ruoyi.common.exception.ServiceException;
import com.ruoyi.common.utils.SecurityUtils;
import com.ruoyi.framework.web.domain.R;
import com.ruoyi.project.system.domain.SysUser;
import com.ruoyi.project.system.mapper.SysUserMapper;
import com.ruoyi.project.system.service.ISysNoticeService;
-import com.ruoyi.staff.mapper.StaffJoinLeaveRecordMapper;
-import com.ruoyi.staff.pojo.StaffJoinLeaveRecord;
+import com.ruoyi.staff.mapper.StaffOnJobMapper;
+import com.ruoyi.staff.pojo.StaffOnJob;
import lombok.RequiredArgsConstructor;
import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+import java.time.LocalDateTime;
import java.time.format.DateTimeFormatter;
import java.util.*;
import java.util.stream.Collectors;
@@ -48,11 +50,12 @@
private final MeetDraftMapper meetDraftMapper;
private final MeetApplicationMapper meetApplicationMapper;
- private final StaffJoinLeaveRecordMapper staffJoinLeaveRecordMapper;
+ private final StaffOnJobMapper staffOnJobMapper;
private final MeetingMinutesMapper meetingMinutesMapper;
private final SysUserMapper userMapper;
private final ISysNoticeService sysNoticeService;
+
@Override
public IPage<MeetingRoom> getMeetingRoomList(SearchMeetingRoomVo vo) {
@@ -82,7 +85,22 @@
}
@Override
+ @Transactional(rollbackFor = Exception.class)
public void deleteMeetingRoom(Long id) {
+ if (id == null){
+ throw new ServiceException("鍒犻櫎浼氳瀹ゅけ璐�,浼氳瀹D涓嶈兘涓虹┖");
+ }
+
+ LocalDateTime now = LocalDateTime.now();
+ List<MeetApplication> meetApplicationList = meetApplicationMapper.selectList(Wrappers.<MeetApplication>lambdaQuery()
+ .eq(MeetApplication::getRoomId, id)
+ .gt(MeetApplication::getEndTime, now)
+ .in(MeetApplication::getStatus, Arrays.asList(0, 1)));
+
+ if (!meetApplicationList.isEmpty()){
+ throw new ServiceException("鍒犻櫎浼氳瀹ゅけ璐�,璇ヤ細璁灏氭湁鏈紑濮嬫垨杩涜涓殑鏈夋晥浼氳棰勭害");
+ }
+
meetingRoomMapper.deleteById(id);
}
@@ -155,43 +173,59 @@
//鍙備細浜哄憳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 -> {
- StaffJoinLeaveRecord record = staffJoinLeaveRecordMapper.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(
"浼氳閫氱煡",
- "浼氳涓婚锛�" + application.getTitle() + "\n" +
- "浼氳鏃堕棿锛�" + application.getStartTime() + "-" + application.getEndTime() + "\n" +
+ "浼氳涓婚锛�" + application.getTitle() + "\t" +
+ "浼氳鏃堕棿锛�" + application.getStartTime() + "-" + application.getEndTime() + "\t" +
"鍙戣捣浜猴細" + application.getApplicant(),
userIds,
- application.getTenantId(),
""
);
}
}
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
@@ -221,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