From 6806e06dad145cbfe1dcec4f551891c6005d7d59 Mon Sep 17 00:00:00 2001
From: sinake <sinake1@qq.com>
Date: 星期二, 19 五月 2026 10:31:43 +0800
Subject: [PATCH] 新增InfoID获取伦理审查发起详细信息挡口,获取捐献工作流新增7个状态字段数据

---
 ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceEthicalreviewinitiateController.java |   26 ++++++++++++++++++++++----
 1 files changed, 22 insertions(+), 4 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 e440b41..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
@@ -100,6 +100,24 @@
     }
 
     /**
+     * 鑾峰彇浼︾悊瀹℃煡鍙戣捣璇︾粏淇℃伅
+     */
+    @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);
+    }
+
+    /**
      * 鏂板浼︾悊瀹℃煡鍙戣捣
      */
     @ApiOperation("鏂板浼︾悊瀹℃煡鍙戣捣")
@@ -134,11 +152,11 @@
     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()){
-                if(ObjectUtils.isNotEmpty(row.getId())){
-                    serviceEthicalreviewopinionsService.updateById(row);
-                }
-
+                    serviceEthicalreviewopinionsService.save(row);
             }
             return AjaxResult.success();
         } else

--
Gitblit v1.9.3