From 645fe0426017b280aa107b9363d37dc85470601b Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期一, 12 一月 2026 17:17:50 +0800
Subject: [PATCH] Merge branch 'jtwy' into dev_New
---
src/main/java/com/ruoyi/collaborativeApproval/service/impl/MeetingServiceImpl.java | 39 +++++++++++++++++++++++++++++++++++++++
1 files changed, 39 insertions(+), 0 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 c269b1a..b57a4f1 100644
--- a/src/main/java/com/ruoyi/collaborativeApproval/service/impl/MeetingServiceImpl.java
+++ b/src/main/java/com/ruoyi/collaborativeApproval/service/impl/MeetingServiceImpl.java
@@ -3,6 +3,8 @@
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;
import com.github.xiaoymin.knife4j.core.util.StrUtil;
@@ -24,6 +26,11 @@
import com.ruoyi.collaborativeApproval.vo.SearchMeetingRoomVo;
import com.ruoyi.collaborativeApproval.vo.SearchMeetingUseVo;
import com.ruoyi.common.utils.SecurityUtils;
+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 lombok.RequiredArgsConstructor;
import org.springframework.stereotype.Service;
@@ -40,8 +47,11 @@
private final MeetDraftMapper meetDraftMapper;
private final MeetApplicationMapper meetApplicationMapper;
+ private final StaffJoinLeaveRecordMapper staffJoinLeaveRecordMapper;
private final MeetingMinutesMapper meetingMinutesMapper;
+ private final SysUserMapper userMapper;
+ private final ISysNoticeService sysNoticeService;
@Override
public IPage<MeetingRoom> getMeetingRoomList(SearchMeetingRoomVo vo) {
@@ -122,6 +132,35 @@
} else {
meetApplicationMapper.insert(meetApplication);
}
+ if (ObjectUtils.isNotNull(meetApplication.getPublishStatus()) && meetApplication.getPublishStatus() == 1){
+ MeetApplication application = meetApplicationMapper.selectById(meetApplication.getId());
+ /*浼氳鍙戝竷鐨勬秷鎭�氱煡*/
+ //鍙備細浜哄憳id(浜哄憳鍙拌处鍜岀敤鎴疯〃閫氳繃浜哄憳缂栧彿鍜岀敤鎴峰悕绉�(鐧诲綍璐﹀彿)鍋氬尮閰�)
+ String cleanStr = application.getParticipants().trim()
+ .replaceAll("^\\[|\\]$", "")
+ .trim();
+ List<Long> ids = 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;
+ })
+ .filter(Objects::nonNull)
+ .collect(Collectors.toList());
+ if (ids.size() > 0) {
+ sysNoticeService.simpleNoticeByUser("浼氳閫氱煡",
+ "浼氳涓婚锛�" + application.getTitle() + "\n" +
+ "浼氳鏃堕棿锛�" + application.getStartTime() + "-" + application.getEndTime() + "\n" +
+ "鍙戣捣浜猴細" + application.getApplicant(),
+ ids,
+ application.getTenantId(),
+ "");
+ }
+ }
}
@Override
--
Gitblit v1.9.3