From 66d041ed14b3ed3ed7183a28a5c588e235fc21d0 Mon Sep 17 00:00:00 2001
From: yuan <123@>
Date: 星期二, 26 五月 2026 11:14:07 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_pro_河南鹤壁' into dev_鹤壁_强信宇_pro

---
 src/main/java/com/ruoyi/collaborativeApproval/controller/MeetingController.java |   41 +++++++++++++++++++++++++++++++++++++++--
 1 files changed, 39 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..716dbe7 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,17 @@
 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.aspectj.lang.annotation.Log;
+import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
 import com.ruoyi.framework.web.domain.R;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import io.swagger.v3.oas.annotations.Operation;
 import lombok.RequiredArgsConstructor;
 import org.springframework.web.bind.annotation.*;
+
+import jakarta.servlet.http.HttpServletResponse;
+import java.util.List;
 
 /**
  * 鍏充簬浼氳controller
@@ -23,6 +34,7 @@
 @RestController
 @RequestMapping("/meeting")
 @RequiredArgsConstructor
+@Tag(name = "浼氳")
 public class MeetingController {
     private final MeetingService meetingService;
 
@@ -32,6 +44,7 @@
         return R.ok(meetingService.getMeetingRoomList(vo));
     }
 
+    @Log(title = "鏂板浼氳瀹�", businessType = BusinessType.INSERT)
     @PostMapping("/saveRoom")
     public R saveRoom(@RequestBody MeetingRoom meetingRoom) {
         meetingService.saveMeetRoom(meetingRoom);
@@ -43,6 +56,7 @@
         return R.ok(meetingService.findMeetRoomById(id));
     }
 
+    @Log(title = "鍒犻櫎浼氳瀹�", businessType = BusinessType.DELETE)
     @DeleteMapping("/delRoom/{id}")
     public R deleteRoom(@PathVariable Long id) {
         meetingService.deleteMeetingRoom(id);
@@ -59,22 +73,24 @@
         return R.ok(meetingService.getMeetingDraftList(vo));
     }
 
+    @Log(title = "淇濆瓨浼氳鑽夌", businessType = BusinessType.INSERT)
     @PostMapping("/saveDraft")
     public R saveMeetingDraft(@RequestBody MeetDraft meetDraft) {
         meetingService.saveMeetDraft(meetDraft);
         return R.ok();
     }
 
+    @Log(title = "鍒犻櫎浼氳鑽夌", businessType = BusinessType.DELETE)
     @DeleteMapping("/delDraft/{id}")
     public R deleteMeetingDraft(@PathVariable Long id) {
         meetingService.deleteMeetingDraft(id);
         return R.ok();
     }
 
+    @Log(title = "鏂板浼氳鐢宠", businessType = BusinessType.INSERT)
     @PostMapping("/saveMeetingApplication")
     public R saveMeetApplication(@RequestBody MeetApplication meetApplication) {
-        meetingService.saveMeetApplication(meetApplication);
-        return R.ok();
+       return meetingService.saveMeetApplication(meetApplication);
     }
 
     @PostMapping("/applicationList")
@@ -101,6 +117,7 @@
         return R.ok(meetingService.getMeetingMinutesById(id));
     }
 
+    @Log(title = "淇濆瓨浼氳绾", businessType = BusinessType.INSERT)
     @PostMapping("/saveMeetingMinutes")
     public R saveMeetingMinutes(@RequestBody MeetingMinutes meetingMinutes) {
         meetingService.saveMeetingMinutes(meetingMinutes);
@@ -117,4 +134,24 @@
         return R.ok(meetingService.getMeetSummaryItems());
     }
 
+    @Operation(summary = "浼氳瀹よ缃鍑�")
+    @Log(title = "瀵煎嚭浼氳瀹よ缃�", businessType = BusinessType.EXPORT)
+    @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;
+
+    @Operation(summary = "浼氳鑽夌瀵煎嚭")
+    @Log(title = "瀵煎嚭浼氳鑽夌", businessType = BusinessType.EXPORT)
+    @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