From 78ee837585bf67ca1b462db6adbdb8135de05fb8 Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期二, 19 十二月 2023 17:50:16 +0800
Subject: [PATCH] 代码提交
---
ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceDonatebaseinfoServiceImpl.java | 20 ++++++++++----------
1 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceDonatebaseinfoServiceImpl.java b/ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceDonatebaseinfoServiceImpl.java
index d53a421..da479a1 100644
--- a/ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceDonatebaseinfoServiceImpl.java
+++ b/ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceDonatebaseinfoServiceImpl.java
@@ -55,7 +55,7 @@
private IServiceRelativesconfirmationService serviceRelativesconfirmationService;
@Autowired
- private IServiceEthicalreviewopinionsService serviceEthicalreviewopinionsService;
+ private IServiceDonateflowchartService iServiceDonateflowchartService;
@Autowired
private IServiceOrganallocationService serviceOrganallocationService;
@@ -314,19 +314,19 @@
//灏佽浼︾悊瀹℃煡
- Map<String, String> ethicalreviewopinions = new HashMap<>();
+ Map<String, String> donateflowcharts = new HashMap<>();
if (serviceDonatebaseinfo.getWorkflow() >= 3) {
- ServiceEthicalreviewopinions serviceEthicalreviewopinions = new ServiceEthicalreviewopinions();
- serviceEthicalreviewopinions.setInfoid(id);
- List<ServiceEthicalreviewopinions> serviceEthicalreviewopinionsList = serviceEthicalreviewopinionsService.queryList(serviceEthicalreviewopinions);
- if (!CollectionUtils.isEmpty(serviceEthicalreviewopinionsList)) {
- ethicalreviewopinions.put("createtime", DateUtils.parseDateToStr("yyyy-MM-dd HH:mm:ss", serviceEthicalreviewopinionsList.get(0).getCreateTime()));
- ethicalreviewopinions.put("updatetime", serviceEthicalreviewopinionsList.get(0).getUpdateTime() != null ? DateUtils.parseDateToStr("yyyy-MM-dd HH:mm:ss", serviceEthicalreviewopinionsList.get(0).getUpdateTime()) : "");
- ethicalreviewopinions.put("process", "");
+ ServiceDonateflowchart serviceDonateflowchart = new ServiceDonateflowchart();
+ serviceDonateflowchart.setInfoid(id);
+ List<ServiceDonateflowchart> serviceDonateflowcharts = iServiceDonateflowchartService.queryList(serviceDonateflowchart);
+ if (!CollectionUtils.isEmpty(serviceDonateflowcharts)) {
+ donateflowcharts.put("createtime", DateUtils.parseDateToStr("yyyy-MM-dd HH:mm:ss", serviceDonateflowcharts.get(0).getCreateTime()));
+ donateflowcharts.put("updatetime", serviceDonateflowcharts.get(0).getUpdateTime() != null ? DateUtils.parseDateToStr("yyyy-MM-dd HH:mm:ss", serviceDonateflowcharts.get(0).getUpdateTime()) : "");
+ donateflowcharts.put("process", "");
}
}
//灏佽浼︾悊瀹℃煡杩斿洖鏁版嵁
- map.put("ethicalreviewopinions", ethicalreviewopinions);
+ map.put("donateflowcharts", donateflowcharts);
//灏佽鍣ㄥ畼鍒嗛厤
Map<String, String> donateorgansService = new HashMap<>();
--
Gitblit v1.9.3