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/controller/MeetingController.java | 31 +++++++++++++++++++++++++++++--
1 files changed, 29 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/ruoyi/collaborativeApproval/controller/MeetingController.java b/src/main/java/com/ruoyi/collaborativeApproval/controller/MeetingController.java
index dcc42ff..956c8bc 100644
--- a/src/main/java/com/ruoyi/collaborativeApproval/controller/MeetingController.java
+++ b/src/main/java/com/ruoyi/collaborativeApproval/controller/MeetingController.java
@@ -1,5 +1,8 @@
package com.ruoyi.collaborativeApproval.controller;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.ruoyi.approve.pojo.ApproveProcess;
+import com.ruoyi.collaborativeApproval.mapper.MeetDraftMapper;
import com.ruoyi.collaborativeApproval.pojo.MeetApplication;
import com.ruoyi.collaborativeApproval.pojo.MeetDraft;
import com.ruoyi.collaborativeApproval.pojo.MeetingMinutes;
@@ -9,9 +12,15 @@
import com.ruoyi.collaborativeApproval.vo.SearchMeetingDraftVo;
import com.ruoyi.collaborativeApproval.vo.SearchMeetingRoomVo;
import com.ruoyi.collaborativeApproval.vo.SearchMeetingUseVo;
+import com.ruoyi.common.utils.poi.ExcelUtil;
import com.ruoyi.framework.web.domain.R;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
import lombok.RequiredArgsConstructor;
import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletResponse;
+import java.util.List;
/**
* 鍏充簬浼氳controller
@@ -23,6 +32,7 @@
@RestController
@RequestMapping("/meeting")
@RequiredArgsConstructor
+@Api(tags = "浼氳")
public class MeetingController {
private final MeetingService meetingService;
@@ -73,8 +83,7 @@
@PostMapping("/saveMeetingApplication")
public R saveMeetApplication(@RequestBody MeetApplication meetApplication) {
- meetingService.saveMeetApplication(meetApplication);
- return R.ok();
+ return meetingService.saveMeetApplication(meetApplication);
}
@PostMapping("/applicationList")
@@ -117,4 +126,22 @@
return R.ok(meetingService.getMeetSummaryItems());
}
+ @ApiOperation(value = "浼氳瀹よ缃鍑�")
+ @PostMapping("/export")
+ public void export(HttpServletResponse response) {
+ List<MeetingRoom> accountExpenses = meetingService.list();
+ ExcelUtil<MeetingRoom> util = new ExcelUtil<MeetingRoom>(MeetingRoom.class);
+ util.exportExcel(response, accountExpenses, "浼氳瀹よ缃鍑�");
+ }
+
+ private final MeetDraftMapper meetDraftMapper;
+
+ @ApiOperation(value = "浼氳鑽夌瀵煎嚭")
+ @PostMapping("/exportOne")
+ public void exportOne(HttpServletResponse response) {
+ List<MeetDraft> accountExpenses = meetDraftMapper.selectList(new LambdaQueryWrapper<MeetDraft>());
+ ExcelUtil<MeetDraft> util = new ExcelUtil<MeetDraft>(MeetDraft.class);
+ util.exportExcel(response, accountExpenses, "浼氳鑽夌瀵煎嚭");
+ }
+
}
--
Gitblit v1.9.3