From 2fdb37e47a5e2ed88ea2fa8bd44072883cc76fc3 Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期二, 19 三月 2024 14:01:40 +0800
Subject: [PATCH] 代码提交
---
ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceDonatebaseinfoServiceImpl.java | 120 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 116 insertions(+), 4 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 2acbe3e..54bcc4e 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
@@ -14,6 +14,7 @@
import com.ruoyi.project.domain.vo.countByRecordStateVO;
import com.ruoyi.project.mapper.*;
import com.ruoyi.project.service.*;
+import com.ruoyi.system.mapper.SysUserMapper;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
@@ -54,8 +55,9 @@
@Autowired
private IServiceRelativesconfirmationService serviceRelativesconfirmationService;
- // @Autowired
-// private IServiceDonateflowchartService iServiceDonateflowchartService;
+ @Autowired
+ private IServiceFundflowruleService serviceFundflowruleService;
+
@Autowired
private IServiceEthicalreviewopinionsService iServiceEthicalreviewopinionsService;
@@ -70,6 +72,8 @@
@Autowired
private IServiceDonatecompletioninfoService serviceDonatecompletioninfoService;
+ @Autowired
+ private SysUserMapper sysUserMapper;
/**
@@ -273,13 +277,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())) {
+ SysUser sysUser = sysUserMapper.selectUserByUserName(serviceDonatebaseinfo.getCreateBy());
+ if (!ObjectUtils.isEmpty(sysUser)) {
+ donatebaseinfo.put("createperson", sysUser.getNickName());
+ }
+ }
+ donatebaseinfo.put("updateperson", null);
+ if (StringUtils.isNotBlank(serviceDonatebaseinfo.getUpdateBy())) {
+ SysUser sysUser = sysUserMapper.selectUserByUserName(serviceDonatebaseinfo.getUpdateBy());
+ if (!ObjectUtils.isEmpty(sysUser)) {
+ donatebaseinfo.put("updateperson", sysUser.getNickName());
+ }
+ }
donatebaseinfo.put("process", "");
//灏佽serviceDonateorgan娼滃湪鎹愮尞杩斿洖鏁版嵁
map.put("donatebaseinfo", donatebaseinfo);
@@ -293,6 +313,21 @@
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())) {
+ SysUser sysUser = sysUserMapper.selectUserByUserName(serviceMedicalevaluations.get(0).getCreateBy());
+ if (!ObjectUtils.isEmpty(sysUser)) {
+ medicalevaluation.put("createperson", sysUser.getNickName());
+ }
+ }
+ medicalevaluation.put("updateperson", null);
+ if (StringUtils.isNotBlank(serviceMedicalevaluations.get(0).getUpdateBy())) {
+ SysUser sysUser = sysUserMapper.selectUserByUserName(serviceMedicalevaluations.get(0).getUpdateBy());
+ if (!ObjectUtils.isEmpty(sysUser)) {
+ medicalevaluation.put("updateperson", sysUser.getNickName());
+ }
+
+ }
medicalevaluation.put("process", "");
}
}
@@ -308,6 +343,21 @@
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())) {
+ SysUser sysUser = sysUserMapper.selectUserByUserName(serviceRelativesconfirmations.get(0).getCreateBy());
+ if (!ObjectUtils.isEmpty(sysUser)) {
+ relativesconfirmation.put("createperson", sysUser.getNickName());
+ }
+
+ }
+ relativesconfirmation.put("updateperson", null);
+ if (StringUtils.isNotBlank(serviceRelativesconfirmations.get(0).getUpdateBy())) {
+ SysUser sysUser = sysUserMapper.selectUserByUserName(serviceRelativesconfirmations.get(0).getUpdateBy());
+ if (!ObjectUtils.isEmpty(sysUser)) {
+ relativesconfirmation.put("updateperson", sysUser.getNickName());
+ }
+ }
relativesconfirmation.put("process", "");
}
}
@@ -324,6 +374,22 @@
if (!CollectionUtils.isEmpty(serviceEthicalreviewopinionsList)) {
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())) {
+ SysUser sysUser = sysUserMapper.selectUserByUserName(serviceEthicalreviewopinionsList.get(0).getCreateBy());
+ if (!ObjectUtils.isEmpty(sysUser)) {
+ donateflowcharts.put("createperson", sysUser.getNickName());
+ }
+
+ }
+ donateflowcharts.put("updateperson", null);
+ if (StringUtils.isNotBlank(serviceEthicalreviewopinionsList.get(0).getUpdateBy())) {
+ SysUser sysUser = sysUserMapper.selectUserByUserName(serviceEthicalreviewopinionsList.get(0).getUpdateBy());
+ if (!ObjectUtils.isEmpty(sysUser)) {
+ donateflowcharts.put("updateperson", sysUser.getNickName());
+ }
+
+ }
donateflowcharts.put("process", "");
}
}
@@ -339,6 +405,22 @@
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())) {
+ SysUser sysUser = sysUserMapper.selectUserByUserName(serviceDonateorgans.get(0).getCreateBy());
+ if (!ObjectUtils.isEmpty(sysUser)) {
+ donateorgansService.put("createperson", sysUser.getNickName());
+ }
+
+ }
+ donateorgansService.put("updateperson", null);
+ if (StringUtils.isNotBlank(serviceDonateorgans.get(0).getUpdateBy())) {
+ SysUser sysUser = sysUserMapper.selectUserByUserName(serviceDonateorgans.get(0).getUpdateBy());
+ if (!ObjectUtils.isEmpty(sysUser)) {
+ donateorgansService.put("updateperson", sysUser.getNickName());
+ }
+ }
donateorgansService.put("process", "");
}
}
@@ -352,6 +434,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())) {
+ SysUser sysUser = sysUserMapper.selectUserByUserName(serviceDonationwitness.getCreateBy());
+ if (!ObjectUtils.isEmpty(sysUser)) {
+ donationwitness.put("createperson", sysUser.getNickName());
+ }
+ }
+ donationwitness.put("updateperson", null);
+ if (StringUtils.isNotBlank(serviceDonationwitness.getUpdateBy())) {
+ SysUser sysUser = sysUserMapper.selectUserByUserName(serviceDonationwitness.getUpdateBy());
+ if (!ObjectUtils.isEmpty(sysUser)) {
+ donationwitness.put("updateperson", sysUser.getNickName());
+ }
+ }
+
donationwitness.put("process", "");
}
}
@@ -367,6 +465,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())) {
+ SysUser sysUser = sysUserMapper.selectUserByUserName(serviceDonatecompletioninfos.get(0).getCreateBy());
+ if (!ObjectUtils.isEmpty(sysUser)) {
+ donatecompletioninfo.put("createperson", sysUser.getNickName());
+ }
+ }
+ donatecompletioninfo.put("updateperson", null);
+ if (StringUtils.isNotBlank(serviceDonatecompletioninfos.get(0).getUpdateBy())) {
+ SysUser sysUser = sysUserMapper.selectUserByUserName(serviceDonatecompletioninfos.get(0).getUpdateBy());
+ if (!ObjectUtils.isEmpty(sysUser)) {
+ donatecompletioninfo.put("updateperson", sysUser.getNickName());
+ }
+ }
+
donatecompletioninfo.put("process", "");
}
}
@@ -377,5 +491,3 @@
return map;
}
}
-
-
--
Gitblit v1.9.3