From 2359f47c2f89a9867e72aa9b171cb118b874afec Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期五, 13 三月 2026 10:29:21 +0800
Subject: [PATCH] 代码提交

---
 ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceEthicalreviewopinionsController.java |   34 ++++++++++++++++++----------------
 1 files changed, 18 insertions(+), 16 deletions(-)

diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceEthicalreviewopinionsController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceEthicalreviewopinionsController.java
index cf6bbe4..b1ae8c4 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceEthicalreviewopinionsController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceEthicalreviewopinionsController.java
@@ -1,5 +1,6 @@
 package com.ruoyi.web.controller.project;
 
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.ruoyi.common.annotation.Log;
 import com.ruoyi.common.annotation.NotRepeatCommit;
 import com.ruoyi.common.annotation.RepeatSubmit;
@@ -7,7 +8,9 @@
 import com.ruoyi.common.core.domain.AjaxResult;
 import com.ruoyi.common.core.page.TableDataInfo;
 import com.ruoyi.common.enums.BusinessType;
+import com.ruoyi.common.utils.PageUtils;
 import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.project.domain.ServiceDonateorganBase;
 import com.ruoyi.project.domain.ServiceEthicalreviewopinions;
 import com.ruoyi.project.domain.vo.EthicalReviewVO;
 import com.ruoyi.project.service.IServiceEthicalreviewopinionsService;
@@ -16,6 +19,7 @@
 
 import java.util.Arrays;
 import java.util.List;
+import java.util.Map;
 
 /**
  * 浼︾悊瀹℃煡涓撳鎰忚Controller
@@ -34,10 +38,9 @@
      */
     //// @PreAuthorize("@ss.hasPermi('project:ethicalreviewopinions:list')")
     @GetMapping("/list")
-    public TableDataInfo list(ServiceEthicalreviewopinions serviceEthicalreviewopinions) {
-        startPage();
-        List<ServiceEthicalreviewopinions> list = serviceEthicalreviewopinionsService.queryList(serviceEthicalreviewopinions);
-        return getDataTable(list);
+    public Map<String, Object> list(ServiceEthicalreviewopinions serviceEthicalreviewopinions) {
+        Page<ServiceEthicalreviewopinions> list = serviceEthicalreviewopinionsService.queryListByPage(serviceEthicalreviewopinions);
+        return getDataTable(list.getRecords(), (int) list.getTotal());
     }
 
     @GetMapping("/listnew")
@@ -48,17 +51,17 @@
     }
 
 
-    /**
-     * 瀵煎嚭浼︾悊瀹℃煡涓撳鎰忚鍒楄〃
-     */
-    //// @PreAuthorize("@ss.hasPermi('project:ethicalreviewopinions:export')")
-    @Log(title = "浼︾悊瀹℃煡涓撳鎰忚", businessType = BusinessType.EXPORT)
-    @GetMapping("/export")
-    public AjaxResult export(ServiceEthicalreviewopinions serviceEthicalreviewopinions) {
-        List<ServiceEthicalreviewopinions> list = serviceEthicalreviewopinionsService.queryList(serviceEthicalreviewopinions);
-        ExcelUtil<ServiceEthicalreviewopinions> util = new ExcelUtil<ServiceEthicalreviewopinions>(ServiceEthicalreviewopinions.class);
-        return util.exportExcel(list, "浼︾悊瀹℃煡涓撳鎰忚鏁版嵁");
-    }
+//    /**
+//     * 瀵煎嚭浼︾悊瀹℃煡涓撳鎰忚鍒楄〃
+//     */
+//    //// @PreAuthorize("@ss.hasPermi('project:ethicalreviewopinions:export')")
+//    @Log(title = "浼︾悊瀹℃煡涓撳鎰忚", businessType = BusinessType.EXPORT)
+//    @GetMapping("/export")
+//    public AjaxResult export(ServiceEthicalreviewopinions serviceEthicalreviewopinions) {
+//        List<ServiceEthicalreviewopinions> list = serviceEthicalreviewopinionsService.queryList(serviceEthicalreviewopinions);
+//        ExcelUtil<ServiceEthicalreviewopinions> util = new ExcelUtil<ServiceEthicalreviewopinions>(ServiceEthicalreviewopinions.class);
+//        return util.exportExcel(list, "浼︾悊瀹℃煡涓撳鎰忚鏁版嵁");
+//    }
 
     /**
      * 鑾峰彇浼︾悊瀹℃煡涓撳鎰忚璇︾粏淇℃伅
@@ -75,7 +78,6 @@
     //// @PreAuthorize("@ss.hasPermi('project:ethicalreviewopinions:add')")
     @Log(title = "浼︾悊瀹℃煡涓撳鎰忚", businessType = BusinessType.INSERT)
     @PostMapping("/add")
-//    @NotRepeatCommit(key = "param:arg[1]", value = 30000)
     public AjaxResult add(@RequestBody ServiceEthicalreviewopinions serviceEthicalreviewopinions) {
         boolean save = serviceEthicalreviewopinionsService.save(serviceEthicalreviewopinions);
         return AjaxResult.success(serviceEthicalreviewopinions);

--
Gitblit v1.9.3