From 1ce5d86886574f256f4440592ffbbadd47bccc9a Mon Sep 17 00:00:00 2001
From: gaoluyang <2820782392@qq.com>
Date: 星期五, 13 十一月 2026 10:48:12 +0800
Subject: [PATCH] fix(staff): 第一学历同步改为取最高学历,专业允许为空
---
src/main/java/com/ruoyi/collaborativeApproval/service/impl/MeetingServiceImpl.java | 168 ++++++++++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 164 insertions(+), 4 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 e5c05ed..3e98f80 100644
--- a/src/main/java/com/ruoyi/collaborativeApproval/service/impl/MeetingServiceImpl.java
+++ b/src/main/java/com/ruoyi/collaborativeApproval/service/impl/MeetingServiceImpl.java
@@ -3,11 +3,16 @@
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;
+import com.ruoyi.approve.pojo.ApproveProcess;
+import com.ruoyi.basic.dto.StorageAttachmentDTO;
+import com.ruoyi.basic.dto.StorageBlobDTO;
+import com.ruoyi.basic.enums.ApplicationTypeEnum;
+import com.ruoyi.basic.enums.RecordTypeEnum;
+import com.ruoyi.basic.utils.FileUtil;
import com.ruoyi.collaborativeApproval.dto.MeetSummaryDto;
import com.ruoyi.collaborativeApproval.dto.MeetUseDto;
import com.ruoyi.collaborativeApproval.dto.MeetingItem;
@@ -28,7 +33,9 @@
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.SysPost;
import com.ruoyi.project.system.domain.SysUser;
+import com.ruoyi.project.system.mapper.SysPostMapper;
import com.ruoyi.project.system.mapper.SysUserMapper;
import com.ruoyi.project.system.service.ISysNoticeService;
import com.ruoyi.staff.mapper.StaffOnJobMapper;
@@ -55,7 +62,9 @@
private final MeetingMinutesMapper meetingMinutesMapper;
private final SysUserMapper userMapper;
+ private final SysPostMapper sysPostMapper;
private final ISysNoticeService sysNoticeService;
+ private final FileUtil fileUtil;
@Override
@@ -239,9 +248,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);
@@ -303,16 +312,59 @@
@Override
public MeetingMinutes getMeetingMinutesById(Long id) {
- return meetingMinutesMapper.selectOne(new LambdaUpdateWrapper<MeetingMinutes>().eq(MeetingMinutes::getMeetingId,id));
+ MeetingMinutes meetingMinutes = meetingMinutesMapper.selectOne(new LambdaUpdateWrapper<MeetingMinutes>().eq(MeetingMinutes::getMeetingId, id));
+ if (meetingMinutes != null) {
+ StorageAttachmentDTO query = new StorageAttachmentDTO();
+ query.setRecordType(RecordTypeEnum.MEETING_MINUTES.getType());
+ query.setRecordId(meetingMinutes.getId());
+ // application 涓嶄紶锛岀収鐗囷紙IMAGE锛夊拰鍏跺畠闄勪欢锛團ILE锛変竴璧疯繑鍥�
+ meetingMinutes.setStorageBlobVOs(fileUtil.getStorageBlobVOsByApplicationAndRecordTypeAndRecordId(query));
+ }
+ return meetingMinutes;
}
@Override
+ @Transactional(rollbackFor = Exception.class)
public void saveMeetingMinutes(MeetingMinutes meetingMinutes) {
if (meetingMinutes.getId() != null){
meetingMinutesMapper.updateById(meetingMinutes);
}else {
meetingMinutesMapper.insert(meetingMinutes);
}
+ // 浼氳鐓х墖/闄勪欢锛氬彧鏈夊墠绔紶浜嗗垪琛ㄦ墠鍚屾闄勪欢锛屾湭浼狅紙null锛夋椂淇濇寔鍘熼檮浠朵笉鍔�
+ if (meetingMinutes.getStorageBlobDTOs() != null) {
+ List<StorageBlobDTO> images = new ArrayList<>();
+ List<StorageBlobDTO> files = new ArrayList<>();
+ for (StorageBlobDTO storageBlobDTO : meetingMinutes.getStorageBlobDTOs()) {
+ if (isImageBlob(storageBlobDTO)) {
+ images.add(storageBlobDTO);
+ } else {
+ files.add(storageBlobDTO);
+ }
+ }
+ // 鍥剧墖瀛樷�滅収鐗団�濈敤閫旓紝鍏朵綑鏂囦欢瀛樷�滈檮浠垛�濈敤閫旓紝涓ょ被浜掍笉褰卞搷
+ fileUtil.saveStorageAttachment(ApplicationTypeEnum.IMAGE, RecordTypeEnum.MEETING_MINUTES,
+ meetingMinutes.getId(), images);
+ fileUtil.saveStorageAttachment(ApplicationTypeEnum.FILE, RecordTypeEnum.MEETING_MINUTES,
+ meetingMinutes.getId(), files);
+ }
+ }
+
+ /**
+ * 鍒ゆ柇涓婁紶鏂囦欢鏄惁鍥剧墖锛堜細璁収鐗囧瓨 IMAGE锛屽叾浣欓檮浠跺瓨 FILE锛�
+ */
+ private boolean isImageBlob(StorageBlobDTO storageBlobDTO) {
+ String contentType = storageBlobDTO.getContentType();
+ if (StrUtil.isNotBlank(contentType)) {
+ return contentType.toLowerCase(Locale.ROOT).startsWith("image/");
+ }
+ String originalFilename = storageBlobDTO.getOriginalFilename();
+ if (!StrUtil.isNotBlank(originalFilename)) {
+ return false;
+ }
+ String lowerName = originalFilename.toLowerCase(Locale.ROOT);
+ return lowerName.endsWith(".png") || lowerName.endsWith(".jpg") || lowerName.endsWith(".jpeg")
+ || lowerName.endsWith(".webp") || lowerName.endsWith(".gif") || lowerName.endsWith(".bmp");
}
@@ -325,6 +377,114 @@
public List<MeetingSimpleDto> getMeetSummaryItems() {
return meetApplicationMapper.getMeetSummaryItems();
}
+
+ @Override
+ public List<ApproveProcess> getUpcomingMeetingReminders() {
+ List<ApproveProcess> reminders = new ArrayList<>();
+ LocalDateTime now = LocalDateTime.now();
+ List<MeetApplication> meetings = meetApplicationMapper.selectList(
+ Wrappers.<MeetApplication>lambdaQuery()
+ .eq(MeetApplication::getPublishStatus, 1)
+ .gt(MeetApplication::getStartTime, now)
+ .le(MeetApplication::getStartTime, now.plusHours(1))
+ .orderByAsc(MeetApplication::getStartTime));
+ if (meetings == null || meetings.isEmpty()) {
+ return reminders;
+ }
+ Long currentUserId = SecurityUtils.getLoginUser().getUserId();
+ Map<Integer, SysPost> postCache = new HashMap<>();
+ for (MeetApplication meeting : meetings) {
+ if (meeting.getStartTime() == null) {
+ continue;
+ }
+ List<Long> staffIds = parseParticipantStaffIds(meeting.getParticipants());
+ if (staffIds.isEmpty()) {
+ continue;
+ }
+ List<StaffOnJob> staffs = staffOnJobMapper.selectBatchIds(staffIds);
+ Map<Long, StaffOnJob> staffMap = (staffs == null) ? new HashMap<>()
+ : staffs.stream().collect(Collectors.toMap(StaffOnJob::getId, s -> s, (a, b) -> a));
+ boolean isParticipant = false;
+ List<String> participantNames = new ArrayList<>();
+ for (Long staffId : staffIds) {
+ StaffOnJob staff = staffMap.get(staffId);
+ if (staff == null) {
+ continue;
+ }
+ String display = staff.getStaffName() == null ? "" : staff.getStaffName();
+ if (staff.getSysPostId() != null) {
+ SysPost post = postCache.get(staff.getSysPostId());
+ if (post == null) {
+ post = sysPostMapper.selectPostById(staff.getSysPostId().longValue());
+ if (post != null) {
+ postCache.put(staff.getSysPostId(), post);
+ }
+ }
+ if (post != null && post.getPostName() != null && !post.getPostName().isEmpty()) {
+ display = display + " (" + post.getPostName() + ")";
+ }
+ }
+ if (!display.isEmpty()) {
+ participantNames.add(display);
+ }
+ if (!isParticipant && staff.getStaffNo() != null) {
+ SysUser user = userMapper.selectOne(
+ Wrappers.<SysUser>lambdaQuery().eq(SysUser::getUserName, staff.getStaffNo()));
+ if (user != null && currentUserId.equals(user.getUserId())) {
+ isParticipant = true;
+ }
+ }
+ }
+ if (!isParticipant) {
+ continue;
+ }
+ String roomName = "浼氳";
+ if (meeting.getRoomId() != null) {
+ MeetingRoom room = meetingRoomMapper.selectById(meeting.getRoomId());
+ if (room != null && room.getName() != null && !room.getName().isEmpty()) {
+ roomName = room.getName();
+ }
+ }
+ ApproveProcess ap = new ApproveProcess();
+ ap.setId(100000000L + meeting.getId());
+ ap.setApproveId("浼氳鎻愰啋");
+ ap.setApproveDeptName(roomName);
+ String reason = "浼氳銆�" + meeting.getTitle() + "銆嬪皢浜� "
+ + meeting.getStartTime().format(DateTimeFormatter.ofPattern("HH:mm")) + " 寮�濮�";
+ if (!participantNames.isEmpty()) {
+ reason += "锛涘弬浼氫汉鍛橈細" + String.join("銆�", participantNames);
+ }
+ ap.setApproveReason(reason);
+ ap.setApproveUserName(meeting.getApplicant());
+ ap.setApproveTime(java.sql.Timestamp.valueOf(meeting.getStartTime()));
+ ap.setApproveTypeName("浼氳鎻愰啋");
+ reminders.add(ap);
+ }
+ return reminders;
+ }
+
+ private List<Long> parseParticipantStaffIds(String participants) {
+ List<Long> ids = new ArrayList<>();
+ if (participants == null || participants.trim().isEmpty()) {
+ return ids;
+ }
+ String cleanStr = participants.replaceAll("^\\[|\\]$", "").trim();
+ if (cleanStr.isEmpty()) {
+ return ids;
+ }
+ for (String s : cleanStr.split(",")) {
+ String val = s.trim();
+ if (val.isEmpty()) {
+ continue;
+ }
+ try {
+ ids.add(Long.valueOf(val));
+ } catch (NumberFormatException ignored) {
+ }
+ }
+ return ids;
+ }
+
}
--
Gitblit v1.9.3