From e941512cb0145a11421ef4cf44bfe2c52cf84aa6 Mon Sep 17 00:00:00 2001
From: gongchunyi <deslre0381@gmail.com>
Date: 星期一, 19 一月 2026 09:58:42 +0800
Subject: [PATCH] fix: 新增和更新时校验会议室时间占用冲突
---
src/main/java/com/ruoyi/collaborativeApproval/service/impl/MeetingServiceImpl.java | 63 +++++++++++++++++++++++--------
1 files changed, 47 insertions(+), 16 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 b57a4f1..bef5926 100644
--- a/src/main/java/com/ruoyi/collaborativeApproval/service/impl/MeetingServiceImpl.java
+++ b/src/main/java/com/ruoyi/collaborativeApproval/service/impl/MeetingServiceImpl.java
@@ -26,6 +26,7 @@
import com.ruoyi.collaborativeApproval.vo.SearchMeetingRoomVo;
import com.ruoyi.collaborativeApproval.vo.SearchMeetingUseVo;
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;
@@ -125,42 +126,72 @@
}
@Override
- public void saveMeetApplication(MeetApplication meetApplication) {
+ public R<Void> saveMeetApplication(MeetApplication meetApplication) {
meetApplication.setApplicant(SecurityUtils.getUsername());
+
+ // 鏃堕棿鍐茬獊鏍￠獙
+ LambdaQueryWrapper<MeetApplication> meetApplicationLambdaQueryWrapper = Wrappers.<MeetApplication>lambdaQuery()
+ .eq(MeetApplication::getRoomId, meetApplication.getRoomId())
+ // 濡傛灉id涓嶄负null鍒欐帓闄よ嚜宸�
+ .ne(meetApplication.getId() != null, MeetApplication::getId, meetApplication.getId())
+ // 鏃堕棿鍐茬獊鍒ゆ柇
+ .lt(MeetApplication::getStartTime, meetApplication.getEndTime())
+ .gt(MeetApplication::getEndTime, meetApplication.getStartTime());
+
+ Long count = meetApplicationMapper.selectCount(meetApplicationLambdaQueryWrapper);
+ if (count > 0) {
+ return R.fail("鎵�閫変細璁鍦ㄨ鏃堕棿娈靛凡鏈夊叾浠栦細璁紝璇疯皟鏁存椂闂存垨鏇存崲浼氳瀹�");
+ }
+
if (meetApplication.getId() != null) {
+ // 鏇存柊
meetApplicationMapper.updateById(meetApplication);
} else {
+ // 鏂板
meetApplicationMapper.insert(meetApplication);
}
- if (ObjectUtils.isNotNull(meetApplication.getPublishStatus()) && meetApplication.getPublishStatus() == 1){
+
+ /*浼氳鍙戝竷鐨勬秷鎭�氱煡*/
+ //鍙備細浜哄憳id(浜哄憳鍙拌处鍜岀敤鎴疯〃閫氳繃浜哄憳缂栧彿鍜岀敤鎴峰悕绉�(鐧诲綍璐﹀彿)鍋氬尮閰�)
+ if (Integer.valueOf(1).equals(meetApplication.getPublishStatus())) {
MeetApplication application = meetApplicationMapper.selectById(meetApplication.getId());
- /*浼氳鍙戝竷鐨勬秷鎭�氱煡*/
- //鍙備細浜哄憳id(浜哄憳鍙拌处鍜岀敤鎴疯〃閫氳繃浜哄憳缂栧彿鍜岀敤鎴峰悕绉�(鐧诲綍璐﹀彿)鍋氬尮閰�)
- String cleanStr = application.getParticipants().trim()
+
+ String cleanStr = application.getParticipants()
.replaceAll("^\\[|\\]$", "")
.trim();
- List<Long> ids = Arrays.stream(cleanStr.split(","))
+
+ List<Long> userIds = Arrays.stream(cleanStr.split(","))
.map(String::trim)
.filter(s -> !s.isEmpty())
- .map(s -> {
- StaffJoinLeaveRecord staffJoinLeaveRecord = staffJoinLeaveRecordMapper.selectById(Long.valueOf(s));
- List<SysUser> users = userMapper.selectList(Wrappers.<SysUser>lambdaQuery().eq(SysUser::getUserName,staffJoinLeaveRecord.getStaffNo()));
- if (users.size() > 0){
- return users.get(0).getUserId();
- }else return null;
+ .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());
- if (ids.size() > 0) {
- sysNoticeService.simpleNoticeByUser("浼氳閫氱煡",
+
+ if (!userIds.isEmpty()) {
+ sysNoticeService.simpleNoticeByUser(
+ "浼氳閫氱煡",
"浼氳涓婚锛�" + application.getTitle() + "\n" +
"浼氳鏃堕棿锛�" + application.getStartTime() + "-" + application.getEndTime() + "\n" +
"鍙戣捣浜猴細" + application.getApplicant(),
- ids,
+ userIds,
application.getTenantId(),
- "");
+ ""
+ );
}
}
+
+ return R.ok();
}
@Override
--
Gitblit v1.9.3