From bf05d91fca1de52d144a4fc5c4cc89481d040aa9 Mon Sep 17 00:00:00 2001
From: sinake <sinake1@qq.com>
Date: 星期一, 18 五月 2026 11:27:05 +0800
Subject: [PATCH] 新增InfoID获取伦理审查发起详细信息挡口,获取捐献工作流新增7个状态字段数据
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceEthicalreviewopinionsController.java | 23 +++++++++++++++--------
1 files changed, 15 insertions(+), 8 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 34c95fd..626f9a6 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
@@ -8,6 +8,7 @@
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.domain.Result;
import com.ruoyi.common.core.page.TableDataInfo;
import com.ruoyi.common.enums.BusinessType;
import com.ruoyi.common.utils.PageUtils;
@@ -16,6 +17,7 @@
import com.ruoyi.project.domain.ServiceEthicalreviewinitiate;
import com.ruoyi.project.domain.ServiceEthicalreviewopinions;
import com.ruoyi.project.domain.vo.EthicalReviewVO;
+import com.ruoyi.project.domain.vo.EthicalreviewopinionsStateTotalVO;
import com.ruoyi.project.domain.vo.EthicalreviewopinionsTotalVO;
import com.ruoyi.project.service.IServiceEthicalreviewinitiateService;
import com.ruoyi.project.service.IServiceEthicalreviewopinionsService;
@@ -101,7 +103,7 @@
return AjaxResult.success(serviceEthicalreviewopinions);
}
- @ApiOperation("浼︾悊瀹℃煡涓撳鎰忚")
+ @ApiOperation("淇敼浼︾悊瀹℃煡涓撳鎰忚")
/**
* 淇敼浼︾悊瀹℃煡涓撳鎰忚
*/
@@ -111,11 +113,11 @@
// @RepeatSubmit
public AjaxResult edit(@RequestBody ServiceEthicalreviewopinions serviceEthicalreviewopinions) {
boolean res=serviceEthicalreviewopinionsService.updateById(serviceEthicalreviewopinions);
- if(res&&serviceEthicalreviewopinions.getExpertType().equals("1")){
+ if(res&&serviceEthicalreviewopinions.getExpertType().equals("涓讳换濮斿憳")&&serviceEthicalreviewopinions.getReceiveStatus().equals("5")){
QueryWrapper<ServiceEthicalreviewinitiate> ethicalreviewinitiateQueryWrapper=new QueryWrapper<>();
ethicalreviewinitiateQueryWrapper.eq("id",serviceEthicalreviewopinions.getNitiateId());
ServiceEthicalreviewinitiate serviceEthicalreviewinitiate =new ServiceEthicalreviewinitiate();
- serviceEthicalreviewinitiate.setStatus("2");
+ serviceEthicalreviewinitiate.setStatus("3");
res=serviceEthicalreviewinitiateService.update(serviceEthicalreviewinitiate,ethicalreviewinitiateQueryWrapper);
}
return toAjax(res);
@@ -157,13 +159,18 @@
return toAjax(serviceEthicalreviewopinionsService.update(serviceEthicalreviewopinions,ethicalreviewopinionsWrapper));
}
- /**
- * 鑾峰彇浼︾悊瀹℃煡涓撳鏁伴噺
- */
+
@ApiOperation("涓撳缁熻璇︽儏")
@GetMapping(value = "/expertTotal")
- public List<EthicalreviewopinionsTotalVO> expertTotal(String expertNo) {
- return serviceEthicalreviewopinionsService.expertTotal(expertNo);
+ public Result<List<EthicalreviewopinionsTotalVO>> expertTotal(String expertNo) {
+ return Result.success(serviceEthicalreviewopinionsService.expertTotal(expertNo)) ;
+ }
+
+
+ @ApiOperation("涓撳鐘舵�佺粺璁�")
+ @GetMapping(value = "/stateTotal")
+ public Result<List<EthicalreviewopinionsStateTotalVO>> stateTotal(String expertNo) {
+ return Result.success(serviceEthicalreviewopinionsService.stateTotal(expertNo));
}
}
--
Gitblit v1.9.3