From a1b154bfd4c5e138d964e1bfdc5a2bcac1e25488 Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期四, 23 四月 2026 11:49:25 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_New_pro' into dev_New_pro
---
src/main/java/com/ruoyi/collaborativeApproval/controller/RulesRegulationsManagementController.java | 18 +++++++++++++++---
1 files changed, 15 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/ruoyi/collaborativeApproval/controller/RulesRegulationsManagementController.java b/src/main/java/com/ruoyi/collaborativeApproval/controller/RulesRegulationsManagementController.java
index c977781..6d7ba9c 100644
--- a/src/main/java/com/ruoyi/collaborativeApproval/controller/RulesRegulationsManagementController.java
+++ b/src/main/java/com/ruoyi/collaborativeApproval/controller/RulesRegulationsManagementController.java
@@ -5,23 +5,26 @@
import com.ruoyi.collaborativeApproval.mapper.ReadingStatusMapper;
import com.ruoyi.collaborativeApproval.pojo.ReadingStatus;
import com.ruoyi.collaborativeApproval.pojo.RulesRegulationsManagement;
+import com.ruoyi.collaborativeApproval.pojo.SealApplicationManagement;
import com.ruoyi.collaborativeApproval.service.RulesRegulationsManagementService;
+import com.ruoyi.common.utils.poi.ExcelUtil;
import com.ruoyi.framework.web.domain.AjaxResult;
+import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.AllArgsConstructor;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.util.CollectionUtils;
import org.springframework.web.bind.annotation.*;
+import jakarta.servlet.http.HttpServletResponse;
import java.util.List;
@RestController
@RequestMapping("/rulesRegulationsManagement")
@AllArgsConstructor
+@Api(tags = "鍒跺害绠＄悊")
public class RulesRegulationsManagementController {
- @Autowired
private RulesRegulationsManagementService rulesRegulationsManagementService;
- @Autowired
private ReadingStatusMapper readingStatusMapper;
@GetMapping("/getList")
@@ -33,7 +36,8 @@
@PostMapping("/add")
@ApiOperation("鏂板")
public AjaxResult add(@RequestBody RulesRegulationsManagement rulesRegulationsManagement){
- return AjaxResult.success(rulesRegulationsManagementService.save(rulesRegulationsManagement));
+ rulesRegulationsManagementService.save(rulesRegulationsManagement);
+ return AjaxResult.success(rulesRegulationsManagement.getId());
}
@PostMapping("/update")
@@ -71,4 +75,12 @@
public AjaxResult getReadingStatusByRuleId(@PathVariable Long ruleId){
return AjaxResult.success(readingStatusMapper.selectList(new QueryWrapper<ReadingStatus>().eq("rule_id", ruleId)));
}
+
+ @ApiOperation(value = "瑙勭珷鍒跺害绠＄悊瀵煎嚭")
+ @PostMapping("/export")
+ public void export(HttpServletResponse response) {
+ List<RulesRegulationsManagement> accountExpenses = rulesRegulationsManagementService.list();
+ ExcelUtil<RulesRegulationsManagement> util = new ExcelUtil<RulesRegulationsManagement>(RulesRegulationsManagement.class);
+ util.exportExcel(response, accountExpenses, "瑙勭珷鍒跺害绠＄悊瀵煎嚭");
+ }
}
--
Gitblit v1.9.3