From af6ffc009f92628023d183ffd4971e7e60084ecd Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期三, 20 五月 2026 17:53:47 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_New_pro' into dev_New_pro

---
 src/main/java/com/ruoyi/collaborativeApproval/controller/RulesRegulationsManagementController.java |   66 ++++++++++++++++----------------
 1 files changed, 33 insertions(+), 33 deletions(-)

diff --git a/src/main/java/com/ruoyi/collaborativeApproval/controller/RulesRegulationsManagementController.java b/src/main/java/com/ruoyi/collaborativeApproval/controller/RulesRegulationsManagementController.java
index acfe676..2496515 100644
--- a/src/main/java/com/ruoyi/collaborativeApproval/controller/RulesRegulationsManagementController.java
+++ b/src/main/java/com/ruoyi/collaborativeApproval/controller/RulesRegulationsManagementController.java
@@ -8,76 +8,76 @@
 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 com.ruoyi.framework.web.controller.BaseController;
+import com.ruoyi.framework.web.domain.R;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import io.swagger.v3.oas.annotations.Operation;
 import lombok.AllArgsConstructor;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.util.CollectionUtils;
 import org.springframework.web.bind.annotation.*;
 
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServletResponse;
 import java.util.List;
 
 @RestController
 @RequestMapping("/rulesRegulationsManagement")
 @AllArgsConstructor
-@Api(tags = "鍒跺害绠＄悊")
-public class RulesRegulationsManagementController {
-    @Autowired
+@Tag(name = "鍒跺害绠＄悊")
+public class RulesRegulationsManagementController extends BaseController {
     private RulesRegulationsManagementService rulesRegulationsManagementService;
-    @Autowired
     private ReadingStatusMapper readingStatusMapper;
 
     @GetMapping("/getList")
-    @ApiOperation("鍒嗛〉鏌ヨ")
-    public AjaxResult listPage(Page page, RulesRegulationsManagement rulesRegulationsManagement){
-        return AjaxResult.success(rulesRegulationsManagementService.listPage(page, rulesRegulationsManagement));
+    @Operation(summary = "鍒嗛〉鏌ヨ")
+    public R<?> listPage(Page page, RulesRegulationsManagement rulesRegulationsManagement){
+        return R.ok(rulesRegulationsManagementService.listPage(page, rulesRegulationsManagement));
     }
 
     @PostMapping("/add")
-    @ApiOperation("鏂板")
-    public AjaxResult add(@RequestBody RulesRegulationsManagement rulesRegulationsManagement){
-        return AjaxResult.success(rulesRegulationsManagementService.save(rulesRegulationsManagement));
+    @Operation(summary = "鏂板")
+    public R<?> add(@RequestBody RulesRegulationsManagement rulesRegulationsManagement){
+        rulesRegulationsManagementService.save(rulesRegulationsManagement);
+        return R.ok(rulesRegulationsManagement.getId());
     }
 
     @PostMapping("/update")
-    @ApiOperation("淇敼")
-    public AjaxResult update(@RequestBody RulesRegulationsManagement rulesRegulationsManagement){
-        return AjaxResult.success(rulesRegulationsManagementService.updateById(rulesRegulationsManagement));
+    @Operation(summary = "淇敼")
+    public R<?> update(@RequestBody RulesRegulationsManagement rulesRegulationsManagement){
+        return R.ok(rulesRegulationsManagementService.updateById(rulesRegulationsManagement));
     }
 
     @DeleteMapping("/delete")
-    @ApiOperation("鍒犻櫎")
-    public AjaxResult delete(@PathVariable("ids") List<Long> ids){
+    @Operation(summary = "鍒犻櫎")
+    public R<?> delete(@PathVariable("ids") List<Long> ids){
         if (CollectionUtils.isEmpty(ids)) {
             throw new RuntimeException("璇蜂紶鍏ヨ鍒犻櫎鐨処D");
         }
-        return AjaxResult.success(rulesRegulationsManagementService.removeBatchByIds(ids));
+        return R.ok(rulesRegulationsManagementService.removeBatchByIds(ids));
     }
     //瑙勫垯鏌ョ湅鏃舵柊澧為槄璇荤姸鎬�
     @PostMapping("/addReadingStatus")
-    @ApiOperation("鏂板闃呰鐘舵��")
-    public AjaxResult addReadingStatus(@RequestBody ReadingStatus readingStatus){
-        return AjaxResult.success(readingStatusMapper.insert(readingStatus));
+    @Operation(summary = "鏂板闃呰鐘舵��")
+    public R<?> addReadingStatus(@RequestBody ReadingStatus readingStatus){
+        return R.ok(readingStatusMapper.insert(readingStatus));
     }
     @PostMapping("/updateReadingStatus")
-    @ApiOperation("淇敼闃呰鐘舵��")
-    public AjaxResult updateReadingStatus(@RequestBody ReadingStatus readingStatus){
-        return AjaxResult.success(readingStatusMapper.updateById(readingStatus));
+    @Operation(summary = "淇敼闃呰鐘舵��")
+    public R<?> updateReadingStatus(@RequestBody ReadingStatus readingStatus){
+        return R.ok(readingStatusMapper.updateById(readingStatus));
     }
     @GetMapping("/getReadingStatusList")
-    @ApiOperation("鍒嗛〉鏌ヨ闃呰鐘舵��")
-    public AjaxResult listPage(Page page, ReadingStatus readingStatus){
-        return AjaxResult.success(readingStatusMapper.selectPage(page,new QueryWrapper<ReadingStatus>(readingStatus)));
+    @Operation(summary = "鍒嗛〉鏌ヨ闃呰鐘舵��")
+    public R<?> listPage(Page page, ReadingStatus readingStatus){
+        return R.ok(readingStatusMapper.selectPage(page,new QueryWrapper<ReadingStatus>(readingStatus)));
     }
     @GetMapping("/getReadingStatusByRuleId/{ruleId}")
-    @ApiOperation("鏍规嵁鍒跺害id鏌ヨ闃呰鐘舵��")
-    public AjaxResult getReadingStatusByRuleId(@PathVariable Long ruleId){
-        return AjaxResult.success(readingStatusMapper.selectList(new QueryWrapper<ReadingStatus>().eq("rule_id", ruleId)));
+    @Operation(summary = "鏍规嵁鍒跺害id鏌ヨ闃呰鐘舵��")
+    public R<?> getReadingStatusByRuleId(@PathVariable Long ruleId){
+        return R.ok(readingStatusMapper.selectList(new QueryWrapper<ReadingStatus>().eq("rule_id", ruleId)));
     }
 
-    @ApiOperation(value = "瑙勭珷鍒跺害绠＄悊瀵煎嚭")
+    @Operation(summary = "瑙勭珷鍒跺害绠＄悊瀵煎嚭")
     @PostMapping("/export")
     public void export(HttpServletResponse response) {
         List<RulesRegulationsManagement> accountExpenses = rulesRegulationsManagementService.list();

--
Gitblit v1.9.3