From bf05d91fca1de52d144a4fc5c4cc89481d040aa9 Mon Sep 17 00:00:00 2001
From: sinake <sinake1@qq.com>
Date: 星期一, 18 五月 2026 11:27:05 +0800
Subject: [PATCH] 新增InfoID获取伦理审查发起详细信息挡口,获取捐献工作流新增7个状态字段数据
---
ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceDonatebaseinfoServiceImpl.java | 16 ++++++++++------
1 files changed, 10 insertions(+), 6 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 3605a75..514758d 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
@@ -304,6 +304,7 @@
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);
+ donatebaseinfo.put("state",StringUtils.nullTo1(serviceDonatebaseinfo.getRecordstate()));
if (StringUtils.isNotBlank(serviceDonatebaseinfo.getCreateBy())) {
SysUser sysUser = sysUserMapper.selectUserByUserName(serviceDonatebaseinfo.getCreateBy());
if (!ObjectUtils.isEmpty(sysUser)) {
@@ -333,6 +334,7 @@
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);
+ medicalevaluation.put("state", StringUtils.nullTo1(StringUtils.nullTo1(serviceMedicalevaluations.get(0).getAssessState())));
if (StringUtils.isNotBlank(serviceMedicalevaluations.get(0).getCreateBy())) {
SysUser sysUser = sysUserMapper.selectUserByUserName(serviceMedicalevaluations.get(0).getCreateBy());
if (!ObjectUtils.isEmpty(sysUser)) {
@@ -365,6 +367,7 @@
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);
+ relativesconfirmation.put("state", StringUtils.nullTo1(serviceRelativesconfirmations.get(0).getState()));
if (StringUtils.isNotBlank(serviceRelativesconfirmations.get(0).getCreateBy())) {
SysUser sysUser = sysUserMapper.selectUserByUserName(serviceRelativesconfirmations.get(0).getCreateBy());
if (!ObjectUtils.isEmpty(sysUser)) {
@@ -397,6 +400,7 @@
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);
+ donateflowcharts.put("state", StringUtils.nullTo1(serviceEthicalreviewopinionsList.get(0).getReceiveStatus()));
if (StringUtils.isNotBlank(serviceEthicalreviewopinionsList.get(0).getCreateBy())) {
SysUser sysUser = sysUserMapper.selectUserByUserName(serviceEthicalreviewopinionsList.get(0).getCreateBy());
if (!ObjectUtils.isEmpty(sysUser)) {
@@ -420,7 +424,7 @@
map1.setDonateflowcharts(donateflowcharts);
//灏佽鍣ㄥ畼鍒嗛厤
- Map<String, String> donateorgansService = new HashMap<>();
+ Map<String, Object> donateorgansService = new HashMap<>();
// if (serviceDonatebaseinfo.getWorkflow() >= 4) {
ServiceDonateorgan serviceDonateorgan = new ServiceDonateorgan();
serviceDonateorgan.setInfoid(id);
@@ -429,8 +433,8 @@
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);
+ donateorgansService.put("state", StringUtils.nullTo1(serviceDonateorgans.get(0).getAllocationstatus()));
if (StringUtils.isNotBlank(serviceDonateorgans.get(0).getCreateBy())) {
SysUser sysUser = sysUserMapper.selectUserByUserName(serviceDonateorgans.get(0).getCreateBy());
if (!ObjectUtils.isEmpty(sysUser)) {
@@ -460,8 +464,8 @@
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);
+ donationwitness.put("state", StringUtils.nullTo1(serviceDonationwitness.getWitnessState()));
if (StringUtils.isNotBlank(serviceDonationwitness.getCreateBy())) {
SysUser sysUser = sysUserMapper.selectUserByUserName(serviceDonationwitness.getCreateBy());
if (!ObjectUtils.isEmpty(sysUser)) {
@@ -493,8 +497,8 @@
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);
+ donatecompletioninfo.put("state", StringUtils.nullTo1(serviceDonatecompletioninfos.get(0).getCompleteState()));
if (StringUtils.isNotBlank(serviceDonatecompletioninfos.get(0).getCreateBy())) {
SysUser sysUser = sysUserMapper.selectUserByUserName(serviceDonatecompletioninfos.get(0).getCreateBy());
if (!ObjectUtils.isEmpty(sysUser)) {
@@ -524,8 +528,8 @@
if(donatemaintenanceEntityList.size()>0){
donatemaintenance.put("createtime", DateUtils.parseDateToStr("yyyy-MM-dd HH:mm:ss", donatemaintenanceEntityList.get(0).getCreateTime()));
donatemaintenance.put("updatetime", donatemaintenanceEntityList.get(0).getUpdateTime() != null ? DateUtils.parseDateToStr("yyyy-MM-dd HH:mm:ss", donatemaintenanceEntityList.get(0).getUpdateTime()) : "");
-
donatemaintenance.put("createperson", null);
+ donatemaintenance.put("state", StringUtils.nullTo1(donatemaintenanceEntityList.get(0).getState()));
if (StringUtils.isNotBlank(donatemaintenanceEntityList.get(0).getCreateBy())) {
SysUser sysUser = sysUserMapper.selectUserByUserName(donatemaintenanceEntityList.get(0).getCreateBy());
if (!ObjectUtils.isEmpty(sysUser)) {
@@ -552,8 +556,8 @@
if(serviceDeathinfoList.size()>0){
deathinfo.put("createtime", DateUtils.parseDateToStr("yyyy-MM-dd HH:mm:ss", serviceDeathinfoList.get(0).getCreateTime()));
deathinfo.put("updatetime", serviceDeathinfoList.get(0).getUpdateTime() != null ? DateUtils.parseDateToStr("yyyy-MM-dd HH:mm:ss", donatemaintenanceEntityList.get(0).getUpdateTime()) : "");
-
deathinfo.put("createperson", null);
+ deathinfo.put("state", StringUtils.nullTo1(serviceDeathinfoList.get(0).getState()));
if (StringUtils.isNotBlank(serviceDeathinfoList.get(0).getCreateBy())) {
SysUser sysUser = sysUserMapper.selectUserByUserName(serviceDeathinfoList.get(0).getCreateBy());
if (!ObjectUtils.isEmpty(sysUser)) {
--
Gitblit v1.9.3