From e842ed74b3167075e4f8f0cf76b38ddc53a8fb54 Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期五, 12 九月 2025 22:18:48 +0800
Subject: [PATCH] 日志修改
---
ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceDonatebaseinfoServiceImpl.java | 222 ++++++++++++++++++++++++++++++++++++++++++++++--------
1 files changed, 187 insertions(+), 35 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 0be0fee..0f4e8a5 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
@@ -1,6 +1,10 @@
package com.ruoyi.project.service.impl;
import java.text.SimpleDateFormat;
+import java.time.LocalDate;
+import java.time.Period;
+import java.time.ZoneId;
+import java.time.temporal.ChronoUnit;
import java.util.*;
import java.util.concurrent.ConcurrentHashMap;
@@ -9,11 +13,14 @@
import com.ruoyi.common.core.domain.entity.SysUser;
import com.ruoyi.common.utils.DateUtils;
import com.ruoyi.common.utils.SecurityUtils;
+import com.ruoyi.project.common.CalculateDateUtils;
import com.ruoyi.project.domain.*;
import com.ruoyi.project.domain.vo.TimeVO;
import com.ruoyi.project.domain.vo.countByRecordStateVO;
import com.ruoyi.project.mapper.*;
import com.ruoyi.project.service.*;
+import com.ruoyi.system.mapper.SysUserMapper;
+import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
@@ -30,6 +37,7 @@
* @author ruoyi
* @date 2021-11-13
*/
+@Slf4j
@Service
public class ServiceDonatebaseinfoServiceImpl extends ServiceImpl<ServiceDonatebaseinfoMapper, ServiceDonatebaseinfo> implements IServiceDonatebaseinfoService {
@@ -55,16 +63,24 @@
private IServiceRelativesconfirmationService serviceRelativesconfirmationService;
@Autowired
- private IServiceEthicalreviewopinionsService serviceEthicalreviewopinionsService;
+ private IServiceFundflowruleService serviceFundflowruleService;
+
+ @Autowired
+ private IServiceEthicalreviewopinionsService iServiceEthicalreviewopinionsService;
@Autowired
private IServiceOrganallocationService serviceOrganallocationService;
+
+ @Autowired
+ private IServiceDonateorganService serviceDonateorganService;
@Autowired
private IServiceDonationwitnessService serviceDonationwitnessService;
@Autowired
private IServiceDonatecompletioninfoService serviceDonatecompletioninfoService;
+ @Autowired
+ private SysUserMapper sysUserMapper;
/**
@@ -212,12 +228,25 @@
}
}
if (b == 1) {
- serviceDonatebaseinfo.setCreateBy(user.getUserName());
+// serviceDonatebaseinfo.setCreateBy(user.getUserName());
+ log.info("user.getUserName()鐨勫�间负 ---- 锛歿}", user.getUserName());
+ serviceDonatebaseinfo.setReporterno(user.getUserName());
}
if (b == 2) {
serviceDonatebaseinfo.setDeptid(user.getDeptId());
}
- return serviceDonatebaseinfoMapper.selectServiceDonatebaseinfoList(serviceDonatebaseinfo);
+ List<ServiceDonatebaseinfo> serviceDonatebaseinfos = serviceDonatebaseinfoMapper.selectServiceDonatebaseinfoList(serviceDonatebaseinfo);
+ for (ServiceDonatebaseinfo serviceDonatebaseinfo1 : serviceDonatebaseinfos) {
+ if (serviceDonatebaseinfo1.getBirthday() != null) {
+ Map<String, String> map = CalculateDateUtils.calculateAge(serviceDonatebaseinfo1.getBirthday().toInstant().atZone(ZoneId.systemDefault()).toLocalDate(), LocalDate.now());
+ serviceDonatebaseinfo1.setAge(org.apache.commons.lang3.ObjectUtils.isNotEmpty(map.get("age")) ? Long.valueOf(map.get("age")) : null);
+ serviceDonatebaseinfo1.setAgeunit(map.get("ageUnit"));
+ serviceDonatebaseinfo1.setAge2(org.apache.commons.lang3.ObjectUtils.isNotEmpty(map.get("age2")) ? Long.valueOf(map.get("age2")) : null);
+ serviceDonatebaseinfo1.setAgeunit2(map.get("ageUnit2"));
+ }
+ }
+
+ return serviceDonatebaseinfos;
}
@Override
@@ -264,34 +293,70 @@
@Override
public Map<String, Object> getWorkFlow(Long id) {
+ log.info("getWorkFlow鐨勫叆鍙侷D涓猴細{}", id);
//鐢ㄤ簬杩斿洖
Map<String, Object> map = new ConcurrentHashMap<>();
ServiceDonatebaseinfo serviceDonatebaseinfo = getById(id);
+
if (ObjectUtils.isEmpty(serviceDonatebaseinfo)) {
return null;
}
+
//灏佽serviceDonateorgan娼滃湪鎹愮尞鏁版嵁
- Map<String, String> donateorgan = new HashMap<>();
- donateorgan.put("createtime", serviceDonatebaseinfo.getCreateTime().toString());
- donateorgan.put("updatetime", serviceDonatebaseinfo.getUpdateTime().toString());
- donateorgan.put("process", "");
+ 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("donateorgan", donateorgan);
+ log.info("妫�鏌ュ皝瑁呮綔鍦ㄦ崘鐚繑鍥炴暟鎹甦onatebaseinfo鐨勫�间负锛歿}", donatebaseinfo);
+ map.put("donatebaseinfo", donatebaseinfo);
//灏佽鍖诲璇勪及
+ log.info("妫�鏌erviceDonatebaseinfo.getWorkflow()鐨勫�间负锛歿}", serviceDonatebaseinfo.getWorkflow());
Map<String, String> medicalevaluation = new HashMap<>();
if (serviceDonatebaseinfo.getWorkflow() >= 1) {
ServiceMedicalevaluation serviceMedicalevaluation = new ServiceMedicalevaluation();
serviceMedicalevaluation.setInfoid(id);
List<ServiceMedicalevaluation> serviceMedicalevaluations = serviceMedicalevaluationService.queryList(serviceMedicalevaluation);
+ log.info("妫�鏌erviceMedicalevaluationService鐨勫�间负锛歿}", serviceMedicalevaluations.size());
if (!CollectionUtils.isEmpty(serviceMedicalevaluations)) {
- medicalevaluation.put("createtime", serviceMedicalevaluations.get(0).getCreateTime().toString());
- medicalevaluation.put("updatetime", serviceMedicalevaluations.get(0).getUpdateTime().toString());
+ 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", "");
}
}
//灏佽鍖诲璇勪及杩斿洖鏁版嵁
+ log.info("妫�鏌ュ皝瑁呭尰瀛﹁瘎浼拌繑鍥炴暟鎹甿edicalevaluation鐨勫�间负锛歿}", medicalevaluation);
map.put("medicalevaluation", medicalevaluation);
//灏佽鎹愮尞纭
@@ -300,56 +365,127 @@
ServiceRelativesconfirmation serviceRelativesconfirmation = new ServiceRelativesconfirmation();
serviceRelativesconfirmation.setInfoid(id);
List<ServiceRelativesconfirmation> serviceRelativesconfirmations = serviceRelativesconfirmationService.queryList(serviceRelativesconfirmation);
+ log.info("妫�鏌erviceRelativesconfirmations鐨勫�间负锛歿}", serviceRelativesconfirmations.size());
if (!CollectionUtils.isEmpty(serviceRelativesconfirmations)) {
- relativesconfirmation.put("createtime", serviceRelativesconfirmations.get(0).getCreateTime().toString());
- relativesconfirmation.put("updatetime", serviceRelativesconfirmations.get(0).getUpdateTime().toString());
+ 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", "");
}
}
//灏佽鎹愮尞纭杩斿洖鏁版嵁
+ log.info("妫�鏌ュ皝瑁呮崘鐚‘璁よ繑鍥炴暟鎹畆elativesconfirmation鐨勫�间负锛歿}", relativesconfirmation);
map.put("relativesconfirmation", relativesconfirmation);
//灏佽浼︾悊瀹℃煡
- 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);
+ log.info("妫�鏌erviceEthicalreviewopinionsList鐨勫�间负锛歿}", serviceEthicalreviewopinionsList.size());
if (!CollectionUtils.isEmpty(serviceEthicalreviewopinionsList)) {
- ethicalreviewopinions.put("createtime", serviceEthicalreviewopinionsList.get(0).getCreateTime().toString());
- ethicalreviewopinions.put("updatetime", serviceEthicalreviewopinionsList.get(0).getUpdateTime().toString());
- 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())) {
+ 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", "");
}
}
//灏佽浼︾悊瀹℃煡杩斿洖鏁版嵁
- map.put("ethicalreviewopinions", ethicalreviewopinions);
+ log.info("妫�鏌ュ皝瑁呬鸡鐞嗗鏌ヨ繑鍥炴暟鎹甦onateflowcharts鐨勫�间负锛歿}", donateflowcharts);
+ map.put("donateflowcharts", donateflowcharts);
//灏佽鍣ㄥ畼鍒嗛厤
- Map<String, String> organallocationService = new HashMap<>();
+ Map<String, String> donateorgansService = new HashMap<>();
if (serviceDonatebaseinfo.getWorkflow() >= 4) {
- ServiceOrganallocation serviceOrganallocation = new ServiceOrganallocation();
- serviceOrganallocation.setOrganid(id);
- List<ServiceOrganallocation> serviceOrganallocations = serviceOrganallocationService.selectServiceOrganallocationList(serviceOrganallocation);
- if (!CollectionUtils.isEmpty(serviceOrganallocations)) {
- organallocationService.put("createtime", serviceOrganallocations.get(0).getCreateTime().toString());
- organallocationService.put("updatetime", serviceOrganallocations.get(0).getUpdateTime().toString());
- organallocationService.put("process", "");
+ ServiceDonateorgan serviceDonateorgan = new ServiceDonateorgan();
+ serviceDonateorgan.setInfoid(id);
+ List<ServiceDonateorgan> serviceDonateorgans = serviceDonateorganService.queryList(serviceDonateorgan);
+ log.info("妫�鏌erviceDonateorgans鐨勫�间负锛歿}", serviceDonateorgans.size());
+ 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", "");
}
}
+ log.info("妫�鏌ュ皝瑁呭櫒瀹樺垎閰嶈繑鍥炴暟鎹甦onateorgansService鐨勫�间负锛歿}", donateorgansService);
//灏佽鍣ㄥ畼鍒嗛厤杩斿洖鏁版嵁
- map.put("organallocationService", organallocationService);
+ map.put("donateorgansService", donateorgansService);
//灏佽鑾峰彇瑙佽瘉
Map<String, String> donationwitness = new HashMap<>();
if (serviceDonatebaseinfo.getWorkflow() >= 5) {
ServiceDonationwitness serviceDonationwitness = serviceDonationwitnessService.getByInfoId(id);
+ log.info("妫�鏌erviceDonationwitness鐨勫�间负锛歿}", serviceDonationwitness);
if (!ObjectUtils.isEmpty(serviceDonationwitness)) {
- donationwitness.put("createtime", serviceDonationwitness.getCreateTime().toString());
- donationwitness.put("updatetime", serviceDonationwitness.getUpdateTime().toString());
+ 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", "");
}
}
+ log.info("妫�鏌ュ皝瑁呰幏鍙栬璇佽繑鍥炴暟鎹甦onationwitness鐨勫�间负锛歿}", donationwitness);
//灏佽鑾峰彇瑙佽瘉杩斿洖鏁版嵁
map.put("donationwitness", donationwitness);
@@ -359,12 +495,30 @@
ServiceDonatecompletioninfo serviceDonatecompletioninfo = new ServiceDonatecompletioninfo();
serviceDonatecompletioninfo.setInfoid(id);
List<ServiceDonatecompletioninfo> serviceDonatecompletioninfos = serviceDonatecompletioninfoService.queryList(serviceDonatecompletioninfo);
+ log.info("妫�鏌erviceDonatecompletioninfos鐨勫�间负锛歿}", serviceDonatecompletioninfos);
if (!CollectionUtils.isEmpty(serviceDonatecompletioninfos)) {
- donatecompletioninfo.put("createtime", serviceDonatecompletioninfos.get(0).getCreateTime().toString());
- donatecompletioninfo.put("updatetime", serviceDonatecompletioninfos.get(0).getUpdateTime().toString());
+ 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", "");
}
}
+ log.info("妫�鏌ュ皝瑁呭畬鎴愮櫥璁拌繑鍥炴暟鎹甦onatecompletioninfo鐨勫�间负锛歿}", donatecompletioninfo);
//灏佽瀹屾垚鐧昏杩斿洖鏁版嵁
map.put("donatecompletioninfo", donatecompletioninfo);
@@ -372,5 +526,3 @@
return map;
}
}
-
-
--
Gitblit v1.9.3