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, 64 insertions(+), 56 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 72578eb..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;
@@ -71,6 +72,8 @@
@Autowired
private IServiceDonatecompletioninfoService serviceDonatecompletioninfoService;
+ @Autowired
+ private SysUserMapper sysUserMapper;
/**
@@ -285,17 +288,17 @@
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());
+ SysUser sysUser = sysUserMapper.selectUserByUserName(serviceDonatebaseinfo.getCreateBy());
+ if (!ObjectUtils.isEmpty(sysUser)) {
+ donatebaseinfo.put("createperson", sysUser.getNickName());
+ }
}
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());
+ SysUser sysUser = sysUserMapper.selectUserByUserName(serviceDonatebaseinfo.getUpdateBy());
+ if (!ObjectUtils.isEmpty(sysUser)) {
+ donatebaseinfo.put("updateperson", sysUser.getNickName());
+ }
}
donatebaseinfo.put("process", "");
//灏佽serviceDonateorgan娼滃湪鎹愮尞杩斿洖鏁版嵁
@@ -312,17 +315,18 @@
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());
+ 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())) {
- ServiceFundflowrule serviceFundflowrule = new ServiceFundflowrule();
- serviceFundflowrule.setCheckuserno(serviceMedicalevaluations.get(0).getUpdateBy());
- List<ServiceFundflowrule> serviceFundflowrules = serviceFundflowruleService.queryList(serviceFundflowrule);
- medicalevaluation.put("updateperson", serviceFundflowrules.get(0).getCheckusername());
+ SysUser sysUser = sysUserMapper.selectUserByUserName(serviceMedicalevaluations.get(0).getUpdateBy());
+ if (!ObjectUtils.isEmpty(sysUser)) {
+ medicalevaluation.put("updateperson", sysUser.getNickName());
+ }
+
}
medicalevaluation.put("process", "");
}
@@ -341,17 +345,18 @@
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());
+ 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())) {
- ServiceFundflowrule serviceFundflowrule = new ServiceFundflowrule();
- serviceFundflowrule.setCheckuserno(serviceRelativesconfirmations.get(0).getUpdateBy());
- List<ServiceFundflowrule> serviceFundflowrules = serviceFundflowruleService.queryList(serviceFundflowrule);
- relativesconfirmation.put("updateperson", serviceFundflowrules.get(0).getCheckusername());
+ SysUser sysUser = sysUserMapper.selectUserByUserName(serviceRelativesconfirmations.get(0).getUpdateBy());
+ if (!ObjectUtils.isEmpty(sysUser)) {
+ relativesconfirmation.put("updateperson", sysUser.getNickName());
+ }
}
relativesconfirmation.put("process", "");
}
@@ -371,17 +376,19 @@
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());
+ 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())) {
- ServiceFundflowrule serviceFundflowrule = new ServiceFundflowrule();
- serviceFundflowrule.setCheckuserno(serviceEthicalreviewopinionsList.get(0).getUpdateBy());
- List<ServiceFundflowrule> serviceFundflowrules = serviceFundflowruleService.queryList(serviceFundflowrule);
- donateflowcharts.put("updateperson", serviceFundflowrules.get(0).getCheckusername());
+ SysUser sysUser = sysUserMapper.selectUserByUserName(serviceEthicalreviewopinionsList.get(0).getUpdateBy());
+ if (!ObjectUtils.isEmpty(sysUser)) {
+ donateflowcharts.put("updateperson", sysUser.getNickName());
+ }
+
}
donateflowcharts.put("process", "");
}
@@ -401,17 +408,18 @@
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());
+ 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())) {
- ServiceFundflowrule serviceFundflowrule = new ServiceFundflowrule();
- serviceFundflowrule.setCheckuserno(serviceDonateorgans.get(0).getUpdateBy());
- List<ServiceFundflowrule> serviceFundflowrules = serviceFundflowruleService.queryList(serviceFundflowrule);
- donateorgansService.put("updateperson", serviceFundflowrules.get(0).getCheckusername());
+ SysUser sysUser = sysUserMapper.selectUserByUserName(serviceDonateorgans.get(0).getUpdateBy());
+ if (!ObjectUtils.isEmpty(sysUser)) {
+ donateorgansService.put("updateperson", sysUser.getNickName());
+ }
}
donateorgansService.put("process", "");
}
@@ -429,17 +437,17 @@
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());
+ SysUser sysUser = sysUserMapper.selectUserByUserName(serviceDonationwitness.getCreateBy());
+ if (!ObjectUtils.isEmpty(sysUser)) {
+ donationwitness.put("createperson", sysUser.getNickName());
+ }
}
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());
+ SysUser sysUser = sysUserMapper.selectUserByUserName(serviceDonationwitness.getUpdateBy());
+ if (!ObjectUtils.isEmpty(sysUser)) {
+ donationwitness.put("updateperson", sysUser.getNickName());
+ }
}
donationwitness.put("process", "");
@@ -460,17 +468,17 @@
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());
+ 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())) {
- ServiceFundflowrule serviceFundflowrule = new ServiceFundflowrule();
- serviceFundflowrule.setCheckuserno(serviceDonatecompletioninfos.get(0).getUpdateBy());
- List<ServiceFundflowrule> serviceFundflowrules = serviceFundflowruleService.queryList(serviceFundflowrule);
- donatecompletioninfo.put("updateperson", serviceFundflowrules.get(0).getCheckusername());
+ SysUser sysUser = sysUserMapper.selectUserByUserName(serviceDonatecompletioninfos.get(0).getUpdateBy());
+ if (!ObjectUtils.isEmpty(sysUser)) {
+ donatecompletioninfo.put("updateperson", sysUser.getNickName());
+ }
}
donatecompletioninfo.put("process", "");
--
Gitblit v1.9.3