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 | 56 +++++++++++++++++++++++++++++++++++++++++++-------------
1 files changed, 43 insertions(+), 13 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 a8d120e..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,14 +8,20 @@
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;
import com.ruoyi.common.utils.poi.ExcelUtil;
import com.ruoyi.project.domain.ServiceDonateorganBase;
+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;
+import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
import io.swagger.annotations.ApiOperation;
@@ -34,20 +40,27 @@
*/
@RestController
@RequestMapping("/project/ethicalreviewopinions")
+@Api(description = "浼︾悊瀹℃煡涓撳鎰忚",tags={"浼︾悊瀹℃煡涓撳鎰忚"})
public class ServiceEthicalreviewopinionsController extends BaseController {
@Autowired
private IServiceEthicalreviewopinionsService serviceEthicalreviewopinionsService;
+ @Autowired
+ private IServiceEthicalreviewinitiateService serviceEthicalreviewinitiateService;
+
+ @ApiOperation("鏌ヨ浼︾悊瀹℃煡涓撳鎰忚鍒楄〃")
/**
* 鏌ヨ浼︾悊瀹℃煡涓撳鎰忚鍒楄〃
*/
//// @PreAuthorize("@ss.hasPermi('project:ethicalreviewopinions:list')")
@GetMapping("/list")
public Map<String, Object> list(ServiceEthicalreviewopinions serviceEthicalreviewopinions) {
+ serviceEthicalreviewopinionsService.updateTimeOut();
Page<ServiceEthicalreviewopinions> list = serviceEthicalreviewopinionsService.queryListByPage(serviceEthicalreviewopinions);
return getDataTable(list.getRecords(), (int) list.getTotal());
}
+ @ApiOperation("鏌ヨ鎹愮尞淇℃伅浼︾悊瀹℃煡涓撳鎰忚鍒楄〃")
@GetMapping("/listnew")
public TableDataInfo listnew(EthicalReviewVO ethicalReviewVO) {
startPage();
@@ -68,6 +81,7 @@
// return util.exportExcel(list, "浼︾悊瀹℃煡涓撳鎰忚鏁版嵁");
// }
+ @ApiOperation("鑾峰彇浼︾悊瀹℃煡涓撳鎰忚璇︾粏淇℃伅")
/**
* 鑾峰彇浼︾悊瀹℃煡涓撳鎰忚璇︾粏淇℃伅
*/
@@ -77,17 +91,19 @@
return AjaxResult.success(serviceEthicalreviewopinionsService.getById(id));
}
+ @ApiOperation("鏂板浼︾悊瀹℃煡涓撳鎰忚")
/**
* 鏂板浼︾悊瀹℃煡涓撳鎰忚
*/
//// @PreAuthorize("@ss.hasPermi('project:ethicalreviewopinions:add')")
- @Log(title = "浼︾悊瀹℃煡涓撳鎰忚", businessType = BusinessType.INSERT)
+ @Log(title = "鏂板浼︾悊瀹℃煡涓撳鎰忚", businessType = BusinessType.INSERT)
@PostMapping("/add")
public AjaxResult add(@RequestBody ServiceEthicalreviewopinions serviceEthicalreviewopinions) {
boolean save = serviceEthicalreviewopinionsService.save(serviceEthicalreviewopinions);
return AjaxResult.success(serviceEthicalreviewopinions);
}
+ @ApiOperation("淇敼浼︾悊瀹℃煡涓撳鎰忚")
/**
* 淇敼浼︾悊瀹℃煡涓撳鎰忚
*/
@@ -96,9 +112,18 @@
@PostMapping("/edit")
// @RepeatSubmit
public AjaxResult edit(@RequestBody ServiceEthicalreviewopinions serviceEthicalreviewopinions) {
- return toAjax(serviceEthicalreviewopinionsService.updateById(serviceEthicalreviewopinions));
+ boolean res=serviceEthicalreviewopinionsService.updateById(serviceEthicalreviewopinions);
+ 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("3");
+ res=serviceEthicalreviewinitiateService.update(serviceEthicalreviewinitiate,ethicalreviewinitiateQueryWrapper);
+ }
+ return toAjax(res);
}
+ @ApiOperation("鍒犻櫎浼︾悊瀹℃煡涓撳鎰忚")
/**
* 鍒犻櫎浼︾悊瀹℃煡涓撳鎰忚
*/
@@ -114,9 +139,9 @@
*/
@ApiOperation("鑾峰彇浼︾悊瀹℃煡涓撳鏁伴噺")
@GetMapping(value = "/expertCount")
- public AjaxResult count(Integer InfoID) {
+ public AjaxResult count(Integer nitiateId) {
QueryWrapper<ServiceEthicalreviewopinions> ethicalreviewopinionsWrapper=new QueryWrapper<>();
- ethicalreviewopinionsWrapper.eq("InfoID",InfoID);
+ ethicalreviewopinionsWrapper.eq("nitiate_Id",nitiateId);
long count =serviceEthicalreviewopinionsService.count(ethicalreviewopinionsWrapper);
return AjaxResult.success(count);
}
@@ -124,23 +149,28 @@
/**
* 鑾峰彇浼︾悊瀹℃煡涓撳鎺ユ敹
*/
- @ApiOperation("鑾峰彇浼︾悊瀹℃煡涓撳鎺ユ敹")
+ @ApiOperation("鑾峰彇浼︾悊瀹℃煡涓撳鐘舵��")
@GetMapping("/receiveStatus")
- public AjaxResult receiveStatus(Integer InfoID,String DonorNo) {
+ public AjaxResult receiveStatus(Integer nitiateId,String expertNo,String receiveStatus) {
QueryWrapper<ServiceEthicalreviewopinions> ethicalreviewopinionsWrapper=new QueryWrapper<>();
- ethicalreviewopinionsWrapper.eq("InfoID",InfoID).eq("DonorNo",DonorNo);
+ ethicalreviewopinionsWrapper.eq("nitiate_Id",nitiateId).eq("expert_no",expertNo);
ServiceEthicalreviewopinions serviceEthicalreviewopinions =new ServiceEthicalreviewopinions();
- serviceEthicalreviewopinions.setReceiveStatus("1");
+ serviceEthicalreviewopinions.setReceiveStatus(receiveStatus);
return toAjax(serviceEthicalreviewopinionsService.update(serviceEthicalreviewopinions,ethicalreviewopinionsWrapper));
}
- /**
- * 鑾峰彇浼︾悊瀹℃煡涓撳鏁伴噺
- */
+
@ApiOperation("涓撳缁熻璇︽儏")
@GetMapping(value = "/expertTotal")
- public AjaxResult expertTotal(String DonorNo) {
- return AjaxResult.success(serviceEthicalreviewopinionsService.expertTotal(DonorNo));
+ 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