From c93fc713fedb68cc96f6f29e0442d949b44b7caa Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期四, 30 四月 2026 17:37:16 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_New_pro' into dev_New_pro

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

diff --git a/src/main/java/com/ruoyi/collaborativeApproval/controller/RulesRegulationsManagementController.java b/src/main/java/com/ruoyi/collaborativeApproval/controller/RulesRegulationsManagementController.java
index ad1afe3..5e59117 100644
--- a/src/main/java/com/ruoyi/collaborativeApproval/controller/RulesRegulationsManagementController.java
+++ b/src/main/java/com/ruoyi/collaborativeApproval/controller/RulesRegulationsManagementController.java
@@ -1,48 +1,86 @@
 package com.ruoyi.collaborativeApproval.controller;
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+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.ApiOperation;
+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 jakarta.servlet.http.HttpServletResponse;
 import java.util.List;
 
 @RestController
 @RequestMapping("/rulesRegulationsManagement")
 @AllArgsConstructor
+@Tag(name = "鍒跺害绠＄悊")
 public class RulesRegulationsManagementController {
-    @Autowired
     private RulesRegulationsManagementService rulesRegulationsManagementService;
+    private ReadingStatusMapper readingStatusMapper;
 
     @GetMapping("/getList")
-    @ApiOperation("鍒嗛〉鏌ヨ")
+    @Operation(summary = "鍒嗛〉鏌ヨ")
     public AjaxResult listPage(Page page, RulesRegulationsManagement rulesRegulationsManagement){
         return AjaxResult.success(rulesRegulationsManagementService.listPage(page, rulesRegulationsManagement));
     }
 
     @PostMapping("/add")
-    @ApiOperation("鏂板")
+    @Operation(summary = "鏂板")
     public AjaxResult add(@RequestBody RulesRegulationsManagement rulesRegulationsManagement){
-        return AjaxResult.success(rulesRegulationsManagementService.save(rulesRegulationsManagement));
+        rulesRegulationsManagementService.save(rulesRegulationsManagement);
+        return AjaxResult.success(rulesRegulationsManagement.getId());
     }
 
     @PostMapping("/update")
-    @ApiOperation("淇敼")
+    @Operation(summary = "淇敼")
     public AjaxResult update(@RequestBody RulesRegulationsManagement rulesRegulationsManagement){
         return AjaxResult.success(rulesRegulationsManagementService.updateById(rulesRegulationsManagement));
     }
 
     @DeleteMapping("/delete")
-    @ApiOperation("鍒犻櫎")
+    @Operation(summary = "鍒犻櫎")
     public AjaxResult delete(@PathVariable("ids") List<Long> ids){
         if (CollectionUtils.isEmpty(ids)) {
             throw new RuntimeException("璇蜂紶鍏ヨ鍒犻櫎鐨処D");
         }
         return AjaxResult.success(rulesRegulationsManagementService.removeBatchByIds(ids));
     }
+    //瑙勫垯鏌ョ湅鏃舵柊澧為槄璇荤姸鎬�
+    @PostMapping("/addReadingStatus")
+    @Operation(summary = "鏂板闃呰鐘舵��")
+    public AjaxResult addReadingStatus(@RequestBody ReadingStatus readingStatus){
+        return AjaxResult.success(readingStatusMapper.insert(readingStatus));
+    }
+    @PostMapping("/updateReadingStatus")
+    @Operation(summary = "淇敼闃呰鐘舵��")
+    public AjaxResult updateReadingStatus(@RequestBody ReadingStatus readingStatus){
+        return AjaxResult.success(readingStatusMapper.updateById(readingStatus));
+    }
+    @GetMapping("/getReadingStatusList")
+    @Operation(summary = "鍒嗛〉鏌ヨ闃呰鐘舵��")
+    public AjaxResult listPage(Page page, ReadingStatus readingStatus){
+        return AjaxResult.success(readingStatusMapper.selectPage(page,new QueryWrapper<ReadingStatus>(readingStatus)));
+    }
+    @GetMapping("/getReadingStatusByRuleId/{ruleId}")
+    @Operation(summary = "鏍规嵁鍒跺害id鏌ヨ闃呰鐘舵��")
+    public AjaxResult getReadingStatusByRuleId(@PathVariable Long ruleId){
+        return AjaxResult.success(readingStatusMapper.selectList(new QueryWrapper<ReadingStatus>().eq("rule_id", ruleId)));
+    }
+
+    @Operation(summary = "瑙勭珷鍒跺害绠＄悊瀵煎嚭")
+    @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