From d42096fd55c4b0caf84bb4f208b4e17534e158c1 Mon Sep 17 00:00:00 2001
From: yxh <172933527@qq.com>
Date: 星期四, 21 五月 2026 15:34:49 +0800
Subject: [PATCH] Merge branch 'master' of http://116.62.18.175:6699/r/opo-qd
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceEthicalreviewinitiateController.java | 55 +++++++++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 55 insertions(+), 0 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 0804f98..92d3be2 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
@@ -1,5 +1,6 @@
package com.ruoyi.web.controller.project;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.ruoyi.common.annotation.Log;
import com.ruoyi.common.annotation.RepeatSubmit;
import com.ruoyi.common.annotation.UniqueCheck;
@@ -16,6 +17,7 @@
import com.ruoyi.project.service.IServiceEthicalreviewopinionsService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
+import org.apache.commons.lang3.ObjectUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.util.CollectionUtils;
import org.springframework.web.bind.annotation.*;
@@ -90,7 +92,28 @@
@GetMapping(value = "/getInfo/{id}")
public AjaxResult getInfo(@PathVariable("id") Long id) {
ServiceEthicalreviewinitiate serviceEthicalreviewinitiate= serviceEthicalreviewinitiateService.getById(id);
+ QueryWrapper<ServiceEthicalreviewopinions> ethicalreviewopinionsWrapper=new QueryWrapper<>();
+ ethicalreviewopinionsWrapper.eq("nitiate_Id",id);
+ List<ServiceEthicalreviewopinions> ethicalreviewopinionsList= serviceEthicalreviewopinionsService.list(ethicalreviewopinionsWrapper);
+ serviceEthicalreviewinitiate.setEthicalreviewopinionsList(ethicalreviewopinionsList);
+ return AjaxResult.success(serviceEthicalreviewinitiate);
+ }
+ /**
+ * 鑾峰彇浼︾悊瀹℃煡鍙戣捣璇︾粏淇℃伅
+ */
+ @ApiOperation("InfoID鑾峰彇浼︾悊瀹℃煡鍙戣捣璇︾粏淇℃伅")
+ @GetMapping(value = "/getInfoID")
+ public AjaxResult getInfoId(Long InfoId) {
+ QueryWrapper<ServiceEthicalreviewinitiate> ethicalreviewinitiateQueryWrapper=new QueryWrapper<>();
+ ethicalreviewinitiateQueryWrapper.eq("InfoId",InfoId);
+ ServiceEthicalreviewinitiate serviceEthicalreviewinitiate= serviceEthicalreviewinitiateService.getOne(ethicalreviewinitiateQueryWrapper);
+ if(serviceEthicalreviewinitiate!=null&&serviceEthicalreviewinitiate.getId()!=null) {
+ QueryWrapper<ServiceEthicalreviewopinions> ethicalreviewopinionsWrapper = new QueryWrapper<>();
+ ethicalreviewopinionsWrapper.eq("nitiate_Id", serviceEthicalreviewinitiate.getId());
+ List<ServiceEthicalreviewopinions> ethicalreviewopinionsList = serviceEthicalreviewopinionsService.list(ethicalreviewopinionsWrapper);
+ serviceEthicalreviewinitiate.setEthicalreviewopinionsList(ethicalreviewopinionsList);
+ }
return AjaxResult.success(serviceEthicalreviewinitiate);
}
@@ -109,6 +132,10 @@
public AjaxResult add(@RequestBody ServiceEthicalreviewinitiate serviceEthicalreviewinitiate) {
boolean result=serviceEthicalreviewinitiateService.save(serviceEthicalreviewinitiate);
if (result) {
+ for(ServiceEthicalreviewopinions row: serviceEthicalreviewinitiate.getEthicalreviewopinionsList()){
+ row.setNitiateId(serviceEthicalreviewinitiate.getId());
+ serviceEthicalreviewopinionsService.save(row);
+ }
return AjaxResult.success(serviceEthicalreviewinitiate.getId());
} else
return AjaxResult.error();
@@ -125,6 +152,12 @@
public AjaxResult edit(@RequestBody ServiceEthicalreviewinitiate serviceEthicalreviewinitiate) {
boolean result=serviceEthicalreviewinitiateService.updateById(serviceEthicalreviewinitiate);
if (result) {
+ QueryWrapper<ServiceEthicalreviewopinions> ethicalreviewopinionsWrapper=new QueryWrapper<>();
+ ethicalreviewopinionsWrapper.eq("nitiate_id",serviceEthicalreviewinitiate.getId());
+ serviceEthicalreviewopinionsService.remove(ethicalreviewopinionsWrapper);
+ for(ServiceEthicalreviewopinions row: serviceEthicalreviewinitiate.getEthicalreviewopinionsList()){
+ serviceEthicalreviewopinionsService.save(row);
+ }
return AjaxResult.success();
} else
return AjaxResult.error();
@@ -140,4 +173,26 @@
public AjaxResult remove(@PathVariable Long[] ids) {
return toAjax(serviceEthicalreviewinitiateService.removeByIds(Arrays.asList(ids)));
}
+
+ /**
+ * 淇敼浼︾悊瀹℃煡鍙戣捣
+ */
+ @ApiOperation("浼︾悊瀹℃煡缁堟")
+ @GetMapping("/stop")
+ public AjaxResult stop(long id) {
+ QueryWrapper<ServiceEthicalreviewinitiate> ethicalreviewinitiateQueryWrapper=new QueryWrapper<>();
+ ethicalreviewinitiateQueryWrapper.eq("id",id);
+ ServiceEthicalreviewinitiate serviceEthicalreviewinitiate =new ServiceEthicalreviewinitiate();
+ serviceEthicalreviewinitiate.setStatus("2");
+ boolean result=serviceEthicalreviewinitiateService.update(serviceEthicalreviewinitiate,ethicalreviewinitiateQueryWrapper);
+ if (result) {
+ QueryWrapper<ServiceEthicalreviewopinions> ethicalreviewopinionsWrapper=new QueryWrapper<>();
+ ethicalreviewopinionsWrapper.eq("nitiate_id",id);
+ ServiceEthicalreviewopinions serviceEthicalreviewopinions =new ServiceEthicalreviewopinions();
+ serviceEthicalreviewopinions.setReceiveStatus("5");
+ serviceEthicalreviewopinionsService.update(serviceEthicalreviewopinions,ethicalreviewopinionsWrapper);
+ return AjaxResult.success();
+ } else
+ return AjaxResult.error();
+ }
}
--
Gitblit v1.9.3