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/ServiceDonatebaseinfoReportController.java | 30 ++++++++++++++++++++++++++++--
1 files changed, 28 insertions(+), 2 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceDonatebaseinfoReportController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceDonatebaseinfoReportController.java
index 5257a8b..e160595 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceDonatebaseinfoReportController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceDonatebaseinfoReportController.java
@@ -14,9 +14,11 @@
import com.ruoyi.project.common.IdGeneratorUtils;
import com.ruoyi.project.domain.ServiceDonatebaseinfoReport;
import com.ruoyi.project.domain.ServiceDonatebaseinfoReportFile;
+import com.ruoyi.project.domain.ServiceTransport;
import com.ruoyi.project.domain.VUserOrg;
import com.ruoyi.project.service.IServiceDonatebaseinfoReportFileService;
import com.ruoyi.project.service.IServiceDonatebaseinfoReportService;
+import com.ruoyi.project.service.IServiceTransportService;
import com.ruoyi.project.service.IVUserOrgService;
import com.ruoyi.system.domain.SysConfig;
import com.ruoyi.system.service.ISysConfigService;
@@ -26,6 +28,7 @@
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
+import java.util.HashMap;
import java.util.List;
import java.util.Map;
@@ -35,7 +38,7 @@
* @author ruoyi
* @date 2025-12-15
*/
-@Api(description = "鎹愮尞涓婃姤鍩虹")
+@Api(description = "鎹愮尞涓婃姤鍩虹",tags={"鎹愮尞涓婃姤"})
@RestController
@RequestMapping("/project/donatebaseinforeport")
public class ServiceDonatebaseinfoReportController extends BaseController {
@@ -47,6 +50,9 @@
private ISysConfigService sysConfigService;
@Autowired
private IVUserOrgService vUserOrgService;
+ @Autowired
+ private IServiceTransportService serviceTransport;
+
/**
* 鏌ヨ鎹愮尞涓婃姤鍩虹鍒楄〃
@@ -103,6 +109,10 @@
serviceDonatebaseinfoReportFile.setDelFlag(0);
List<ServiceDonatebaseinfoReportFile> serviceDonatebaseinfoReportFiles = serviceDonatebaseinfoReportFileService.queryList(serviceDonatebaseinfoReportFile);
serviceDonatebaseinfoReport.setAnnexfilesList(serviceDonatebaseinfoReportFiles);
+ Map<String,Object> transportMap=new HashMap<>();
+ transportMap.put("report_id",serviceDonatebaseinfoReport.getId());
+ List<ServiceTransport> transports= serviceTransport.listByMap(transportMap);
+ serviceDonatebaseinfoReport.setServiceTransport(transports);
return AjaxResult.success(serviceDonatebaseinfoReport);
}
@@ -150,7 +160,7 @@
boolean b = serviceDonatebaseinfoReportService.updateById(serviceDonatebaseinfoReport);
if (b) {
serviceDonatebaseinfoReportFileService.updateList(serviceDonatebaseinfoReport.getAnnexfilesList(), serviceDonatebaseinfoReport.getId(), serviceDonatebaseinfoReport.getCaseNo(), getNickName());
- if (serviceDonatebaseinfoReport.getReportStatus().equals("3")) {
+ if (serviceDonatebaseinfoReport.getReportStatus().equals("3")&&serviceDonatebaseinfoReport.getIsDonate().equals(1)) {
//濡傛灉鍚屾剰涓婃姤锛岄偅灏卞彲浠ュ缓妗ｄ簡锛堝線 ServiceDonatebaseinfo鏂板锛�
serviceDonatebaseinfoReportService.createDocument(serviceDonatebaseinfoReport);
}
@@ -170,4 +180,20 @@
serviceDonatebaseinfoReport.setDelFlag(1);
return toAjax(serviceDonatebaseinfoReportService.updateById(serviceDonatebaseinfoReport));
}
+
+ /**
+ * 淇敼鎹愮尞涓婃姤鍩虹
+ */
+ @ApiOperation("涓婃姤")
+ @Log(title = "涓婃姤", businessType = BusinessType.UPDATE)
+ @PostMapping("/report")
+ @RepeatSubmit
+ public AjaxResult report(@RequestBody ServiceDonatebaseinfoReport serviceDonatebaseinfoReport) {
+ if (StringUtils.isEmpty(serviceDonatebaseinfoReport.getCaseNo())) {
+ throw new BaseException("妗堜緥缂栧彿涓虹┖锛岃妫�鏌ュ悗鍐嶄慨鏀�");
+ }
+ boolean b = serviceDonatebaseinfoReportService.updateById(serviceDonatebaseinfoReport);
+
+ return toAjax(b);
+ }
}
--
Gitblit v1.9.3