From d88fffd5d757a23f302011ced88dea92e1ce31e9 Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期五, 30 一月 2026 13:48:20 +0800
Subject: [PATCH] 代码提交
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceEthicalreviewinitiateController.java | 43 ++++++++++++++++++++++++++++++++++---------
1 files changed, 34 insertions(+), 9 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceEthicalreviewinitiateController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceEthicalreviewinitiateController.java
index aa54460..0b804b0 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceEthicalreviewinitiateController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceEthicalreviewinitiateController.java
@@ -4,18 +4,23 @@
import com.ruoyi.common.annotation.RepeatSubmit;
import com.ruoyi.common.core.controller.BaseController;
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.dto.ReviewInitiateBaseInfoDTO;
+import com.ruoyi.project.domain.dto.WitnessBaseInfoDTO;
+import com.ruoyi.project.domain.vo.ReviewInitiateBaseInfoVO;
import com.ruoyi.project.domain.ServiceEthicalreviewinitiate;
import com.ruoyi.project.service.IServiceEthicalreviewinitiateService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.CollectionUtils;
import org.springframework.web.bind.annotation.*;
import java.util.Arrays;
import java.util.List;
+import java.util.Map;
/**
* 浼︾悊瀹℃煡鍙戣捣Controller
@@ -25,21 +30,41 @@
*/
@Api(description = "浼︾悊瀹℃煡鍙戣捣")
@RestController
-@RequestMapping("/system/ethicalreviewinitiate")
+@RequestMapping("/project/ethicalreviewinitiate")
public class ServiceEthicalreviewinitiateController extends BaseController {
@Autowired
private IServiceEthicalreviewinitiateService serviceEthicalreviewinitiateService;
+// /**
+// * 鏌ヨ浼︾悊瀹℃煡鍙戣捣鍒楄〃
+// */
+// @ApiOperation("鏌ヨ浼︾悊瀹℃煡鍙戣捣鍒楄〃")
+// // @PreAuthorize("@ss.hasPermi('system:ethicalreviewinitiate:list')")
+// @PostMapping("/list")
+// public TableDataInfo list(ServiceEthicalreviewinitiate serviceEthicalreviewinitiate) {
+// startPage();
+// List<ServiceEthicalreviewinitiate> list = serviceEthicalreviewinitiateService.queryList(serviceEthicalreviewinitiate);
+// return getDataTable(list);
+// }
+
/**
- * 鏌ヨ浼︾悊瀹℃煡鍙戣捣鍒楄〃
+ * 浼︾悊瀹℃煡鍩烘湰淇℃伅闆嗗悎
*/
- @ApiOperation("鏌ヨ浼︾悊瀹℃煡鍙戣捣鍒楄〃")
+ @ApiOperation("浼︾悊瀹℃煡鍩烘湰淇℃伅闆嗗悎")
// @PreAuthorize("@ss.hasPermi('system:ethicalreviewinitiate:list')")
- @PostMapping("/list")
- public TableDataInfo list(ServiceEthicalreviewinitiate serviceEthicalreviewinitiate) {
- startPage();
- List<ServiceEthicalreviewinitiate> list = serviceEthicalreviewinitiateService.queryList(serviceEthicalreviewinitiate);
- return getDataTable(list);
+ @PostMapping("/reviewinitiateBaseInfoList")
+ public Map<String, Object> reviewinitiateBaseInfoList(@RequestBody ReviewInitiateBaseInfoVO reviewInitiateBaseInfoVO) {
+ Integer offset = PageUtils.getOffset(reviewInitiateBaseInfoVO.getPageNum(), reviewInitiateBaseInfoVO.getPageSize());
+ reviewInitiateBaseInfoVO.setPageNum(offset);
+ List<ReviewInitiateBaseInfoDTO> list = serviceEthicalreviewinitiateService.reviewinitiateBaseInfoList(reviewInitiateBaseInfoVO);
+
+ //鑾峰彇鎬绘暟
+ reviewInitiateBaseInfoVO.setPageNum(null);
+ reviewInitiateBaseInfoVO.setPageSize(null);
+ Integer totalCount = 0;
+ List<ReviewInitiateBaseInfoDTO> total = serviceEthicalreviewinitiateService.reviewinitiateBaseInfoList(reviewInitiateBaseInfoVO);
+ if (!CollectionUtils.isEmpty(total)) totalCount = total.size();
+ return getDataTable(list,totalCount);
}
/**
--
Gitblit v1.9.3