From 42288de2a4a83772558ac6a28be42ab49b7683b8 Mon Sep 17 00:00:00 2001
From: liyong <18434998025@163.com>
Date: 星期二, 03 二月 2026 16:55:26 +0800
Subject: [PATCH] feat(quality): 添加质检单关联订单号和合同号查询功能
---
src/main/java/com/ruoyi/collaborativeApproval/service/impl/MeetingServiceImpl.java | 22 ++++++++++++++++++++--
1 files changed, 20 insertions(+), 2 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 9fa232a..e5c05ed 100644
--- a/src/main/java/com/ruoyi/collaborativeApproval/service/impl/MeetingServiceImpl.java
+++ b/src/main/java/com/ruoyi/collaborativeApproval/service/impl/MeetingServiceImpl.java
@@ -25,6 +25,7 @@
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;
@@ -34,7 +35,9 @@
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;
@@ -83,7 +86,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);
}
@@ -182,8 +200,8 @@
if (!userIds.isEmpty()) {
sysNoticeService.simpleNoticeByUser(
"浼氳閫氱煡",
- "浼氳涓婚锛�" + application.getTitle() + "\n" +
- "浼氳鏃堕棿锛�" + application.getStartTime() + "-" + application.getEndTime() + "\n" +
+ "浼氳涓婚锛�" + application.getTitle() + "\t" +
+ "浼氳鏃堕棿锛�" + application.getStartTime() + "-" + application.getEndTime() + "\t" +
"鍙戣捣浜猴細" + application.getApplicant(),
userIds,
""
--
Gitblit v1.9.3