From 96f982f2c64343514cebc05b6c45715a5ac7ce9c Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期一, 11 三月 2024 10:26:15 +0800
Subject: [PATCH] 错误修改
---
ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceDonatebaseinfoServiceImpl.java | 128 +++++++++++++++++++++++++++++++++++++++---
1 files changed, 117 insertions(+), 11 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..72578eb 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,10 @@
private IServiceRelativesconfirmationService serviceRelativesconfirmationService;
@Autowired
- private IServiceEthicalreviewopinionsService serviceEthicalreviewopinionsService;
+ private IServiceFundflowruleService serviceFundflowruleService;
+
+ @Autowired
+ private IServiceEthicalreviewopinionsService iServiceEthicalreviewopinionsService;
@Autowired
private IServiceOrganallocationService serviceOrganallocationService;
@@ -271,13 +274,29 @@
Map<String, Object> map = new ConcurrentHashMap<>();
ServiceDonatebaseinfo serviceDonatebaseinfo = getById(id);
+
if (ObjectUtils.isEmpty(serviceDonatebaseinfo)) {
return null;
}
+
//灏佽serviceDonateorgan娼滃湪鎹愮尞鏁版嵁
Map<String, String> donatebaseinfo = new HashMap<>();
donatebaseinfo.put("createtime", DateUtils.parseDateToStr("yyyy-MM-dd HH:mm:ss", serviceDonatebaseinfo.getCreateTime()));
donatebaseinfo.put("updatetime", serviceDonatebaseinfo.getUpdateTime() != null ? DateUtils.parseDateToStr("yyyy-MM-dd HH:mm:ss", serviceDonatebaseinfo.getUpdateTime()) : "");
+ donatebaseinfo.put("createperson", null);
+ if (StringUtils.isNotBlank(serviceDonatebaseinfo.getCreateBy())) {
+ ServiceFundflowrule serviceFundflowrule = new ServiceFundflowrule();
+ serviceFundflowrule.setCheckuserno(serviceDonatebaseinfo.getCreateBy());
+ List<ServiceFundflowrule> serviceFundflowrules = serviceFundflowruleService.queryList(serviceFundflowrule);
+ donatebaseinfo.put("createperson", serviceFundflowrules.get(0).getCheckusername());
+ }
+ donatebaseinfo.put("updateperson", null);
+ if (StringUtils.isNotBlank(serviceDonatebaseinfo.getUpdateBy())) {
+ ServiceFundflowrule serviceFundflowrule = new ServiceFundflowrule();
+ serviceFundflowrule.setCheckuserno(serviceDonatebaseinfo.getUpdateBy());
+ List<ServiceFundflowrule> serviceFundflowrules = serviceFundflowruleService.queryList(serviceFundflowrule);
+ donatebaseinfo.put("updateperson", serviceFundflowrules.get(0).getCheckusername());
+ }
donatebaseinfo.put("process", "");
//灏佽serviceDonateorgan娼滃湪鎹愮尞杩斿洖鏁版嵁
map.put("donatebaseinfo", donatebaseinfo);
@@ -291,6 +310,20 @@
if (!CollectionUtils.isEmpty(serviceMedicalevaluations)) {
medicalevaluation.put("createtime", DateUtils.parseDateToStr("yyyy-MM-dd HH:mm:ss", serviceMedicalevaluations.get(0).getCreateTime()));
medicalevaluation.put("updatetime", serviceMedicalevaluations.get(0).getUpdateTime() != null ? DateUtils.parseDateToStr("yyyy-MM-dd HH:mm:ss", serviceMedicalevaluations.get(0).getUpdateTime()) : null);
+ medicalevaluation.put("createperson", null);
+ if (StringUtils.isNotBlank(serviceMedicalevaluations.get(0).getCreateBy())) {
+ ServiceFundflowrule serviceFundflowrule = new ServiceFundflowrule();
+ serviceFundflowrule.setCheckuserno(serviceMedicalevaluations.get(0).getCreateBy());
+ List<ServiceFundflowrule> serviceFundflowrules = serviceFundflowruleService.queryList(serviceFundflowrule);
+ medicalevaluation.put("createperson", serviceFundflowrules.get(0).getCheckusername());
+ }
+ medicalevaluation.put("updateperson", null);
+ if (StringUtils.isNotBlank(serviceMedicalevaluations.get(0).getUpdateBy())) {
+ ServiceFundflowrule serviceFundflowrule = new ServiceFundflowrule();
+ serviceFundflowrule.setCheckuserno(serviceMedicalevaluations.get(0).getUpdateBy());
+ List<ServiceFundflowrule> serviceFundflowrules = serviceFundflowruleService.queryList(serviceFundflowrule);
+ medicalevaluation.put("updateperson", serviceFundflowrules.get(0).getCheckusername());
+ }
medicalevaluation.put("process", "");
}
}
@@ -306,6 +339,20 @@
if (!CollectionUtils.isEmpty(serviceRelativesconfirmations)) {
relativesconfirmation.put("createtime", DateUtils.parseDateToStr("yyyy-MM-dd HH:mm:ss", serviceRelativesconfirmations.get(0).getCreateTime()));
relativesconfirmation.put("updatetime", serviceRelativesconfirmations.get(0).getUpdateTime() != null ? DateUtils.parseDateToStr("yyyy-MM-dd HH:mm:ss", serviceRelativesconfirmations.get(0).getUpdateTime()) : "");
+ relativesconfirmation.put("createperson", null);
+ if (StringUtils.isNotBlank(serviceRelativesconfirmations.get(0).getCreateBy())) {
+ ServiceFundflowrule serviceFundflowrule = new ServiceFundflowrule();
+ serviceFundflowrule.setCheckuserno(serviceRelativesconfirmations.get(0).getCreateBy());
+ List<ServiceFundflowrule> serviceFundflowrules = serviceFundflowruleService.queryList(serviceFundflowrule);
+ relativesconfirmation.put("createperson", serviceFundflowrules.get(0).getCheckusername());
+ }
+ relativesconfirmation.put("updateperson", null);
+ if (StringUtils.isNotBlank(serviceRelativesconfirmations.get(0).getUpdateBy())) {
+ ServiceFundflowrule serviceFundflowrule = new ServiceFundflowrule();
+ serviceFundflowrule.setCheckuserno(serviceRelativesconfirmations.get(0).getUpdateBy());
+ List<ServiceFundflowrule> serviceFundflowrules = serviceFundflowruleService.queryList(serviceFundflowrule);
+ relativesconfirmation.put("updateperson", serviceFundflowrules.get(0).getCheckusername());
+ }
relativesconfirmation.put("process", "");
}
}
@@ -314,19 +361,33 @@
//灏佽浼︾悊瀹℃煡
- 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);
+ ServiceEthicalreviewopinions serviceDonateflowchart = new ServiceEthicalreviewopinions();
+ serviceDonateflowchart.setInfoid(id);
+ List<ServiceEthicalreviewopinions> serviceEthicalreviewopinionsList = iServiceEthicalreviewopinionsService.queryList(serviceDonateflowchart);
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", "");
+ donateflowcharts.put("createtime", DateUtils.parseDateToStr("yyyy-MM-dd HH:mm:ss", serviceEthicalreviewopinionsList.get(0).getCreateTime()));
+ donateflowcharts.put("updatetime", serviceEthicalreviewopinionsList.get(0).getUpdateTime() != null ? DateUtils.parseDateToStr("yyyy-MM-dd HH:mm:ss", serviceEthicalreviewopinionsList.get(0).getUpdateTime()) : "");
+ donateflowcharts.put("createperson", null);
+ if (StringUtils.isNotBlank(serviceEthicalreviewopinionsList.get(0).getCreateBy())) {
+ ServiceFundflowrule serviceFundflowrule = new ServiceFundflowrule();
+ serviceFundflowrule.setCheckuserno(serviceEthicalreviewopinionsList.get(0).getCreateBy());
+ List<ServiceFundflowrule> serviceFundflowrules = serviceFundflowruleService.queryList(serviceFundflowrule);
+ donateflowcharts.put("createperson", serviceFundflowrules.get(0).getCheckusername());
+ }
+ donateflowcharts.put("updateperson", null);
+ if (StringUtils.isNotBlank(serviceEthicalreviewopinionsList.get(0).getUpdateBy())) {
+ ServiceFundflowrule serviceFundflowrule = new ServiceFundflowrule();
+ serviceFundflowrule.setCheckuserno(serviceEthicalreviewopinionsList.get(0).getUpdateBy());
+ List<ServiceFundflowrule> serviceFundflowrules = serviceFundflowruleService.queryList(serviceFundflowrule);
+ donateflowcharts.put("updateperson", serviceFundflowrules.get(0).getCheckusername());
+ }
+ donateflowcharts.put("process", "");
}
}
//灏佽浼︾悊瀹℃煡杩斿洖鏁版嵁
- map.put("ethicalreviewopinions", ethicalreviewopinions);
+ map.put("donateflowcharts", donateflowcharts);
//灏佽鍣ㄥ畼鍒嗛厤
Map<String, String> donateorgansService = new HashMap<>();
@@ -337,6 +398,21 @@
if (!CollectionUtils.isEmpty(serviceDonateorgans)) {
donateorgansService.put("createtime", DateUtils.parseDateToStr("yyyy-MM-dd HH:mm:ss", serviceDonateorgans.get(0).getCreateTime()));
donateorgansService.put("updatetime", serviceDonateorgans.get(0).getUpdateTime() != null ? DateUtils.parseDateToStr("yyyy-MM-dd HH:mm:ss", serviceDonateorgans.get(0).getUpdateTime()) : "");
+
+ donateorgansService.put("createperson", null);
+ if (StringUtils.isNotBlank(serviceDonateorgans.get(0).getCreateBy())) {
+ ServiceFundflowrule serviceFundflowrule = new ServiceFundflowrule();
+ serviceFundflowrule.setCheckuserno(serviceDonateorgans.get(0).getCreateBy());
+ List<ServiceFundflowrule> serviceFundflowrules = serviceFundflowruleService.queryList(serviceFundflowrule);
+ donateorgansService.put("createperson", serviceFundflowrules.get(0).getCheckusername());
+ }
+ donateorgansService.put("updateperson", null);
+ if (StringUtils.isNotBlank(serviceDonateorgans.get(0).getUpdateBy())) {
+ ServiceFundflowrule serviceFundflowrule = new ServiceFundflowrule();
+ serviceFundflowrule.setCheckuserno(serviceDonateorgans.get(0).getUpdateBy());
+ List<ServiceFundflowrule> serviceFundflowrules = serviceFundflowruleService.queryList(serviceFundflowrule);
+ donateorgansService.put("updateperson", serviceFundflowrules.get(0).getCheckusername());
+ }
donateorgansService.put("process", "");
}
}
@@ -350,6 +426,22 @@
if (!ObjectUtils.isEmpty(serviceDonationwitness)) {
donationwitness.put("createtime", DateUtils.parseDateToStr("yyyy-MM-dd HH:mm:ss", serviceDonationwitness.getCreateTime()));
donationwitness.put("updatetime", serviceDonationwitness.getUpdateTime() != null ? DateUtils.parseDateToStr("yyyy-MM-dd HH:mm:ss", serviceDonationwitness.getUpdateTime()) : "");
+
+ donationwitness.put("createperson", null);
+ if (StringUtils.isNotBlank(serviceDonationwitness.getCreateBy())) {
+ ServiceFundflowrule serviceFundflowrule = new ServiceFundflowrule();
+ serviceFundflowrule.setCheckuserno(serviceDonationwitness.getCreateBy());
+ List<ServiceFundflowrule> serviceFundflowrules = serviceFundflowruleService.queryList(serviceFundflowrule);
+ donationwitness.put("createperson", serviceFundflowrules.get(0).getCheckusername());
+ }
+ donationwitness.put("updateperson", null);
+ if (StringUtils.isNotBlank(serviceDonationwitness.getUpdateBy())) {
+ ServiceFundflowrule serviceFundflowrule = new ServiceFundflowrule();
+ serviceFundflowrule.setCheckuserno(serviceDonationwitness.getUpdateBy());
+ List<ServiceFundflowrule> serviceFundflowrules = serviceFundflowruleService.queryList(serviceFundflowrule);
+ donationwitness.put("updateperson", serviceFundflowrules.get(0).getCheckusername());
+ }
+
donationwitness.put("process", "");
}
}
@@ -365,6 +457,22 @@
if (!CollectionUtils.isEmpty(serviceDonatecompletioninfos)) {
donatecompletioninfo.put("createtime", DateUtils.parseDateToStr("yyyy-MM-dd HH:mm:ss", serviceDonatecompletioninfos.get(0).getCreateTime()));
donatecompletioninfo.put("updatetime", serviceDonatecompletioninfos.get(0).getUpdateTime() != null ? DateUtils.parseDateToStr("yyyy-MM-dd HH:mm:ss", serviceDonatecompletioninfos.get(0).getUpdateTime()) : "");
+
+ donatecompletioninfo.put("createperson", null);
+ if (StringUtils.isNotBlank(serviceDonatecompletioninfos.get(0).getCreateBy())) {
+ ServiceFundflowrule serviceFundflowrule = new ServiceFundflowrule();
+ serviceFundflowrule.setCheckuserno(serviceDonatecompletioninfos.get(0).getCreateBy());
+ List<ServiceFundflowrule> serviceFundflowrules = serviceFundflowruleService.queryList(serviceFundflowrule);
+ donatecompletioninfo.put("createperson", serviceFundflowrules.get(0).getCheckusername());
+ }
+ donatecompletioninfo.put("updateperson", null);
+ if (StringUtils.isNotBlank(serviceDonatecompletioninfos.get(0).getUpdateBy())) {
+ ServiceFundflowrule serviceFundflowrule = new ServiceFundflowrule();
+ serviceFundflowrule.setCheckuserno(serviceDonatecompletioninfos.get(0).getUpdateBy());
+ List<ServiceFundflowrule> serviceFundflowrules = serviceFundflowruleService.queryList(serviceFundflowrule);
+ donatecompletioninfo.put("updateperson", serviceFundflowrules.get(0).getCheckusername());
+ }
+
donatecompletioninfo.put("process", "");
}
}
@@ -375,5 +483,3 @@
return map;
}
}
-
-
--
Gitblit v1.9.3