From e148e3385c9dffb7db0a0f45463dd2f01cbf7775 Mon Sep 17 00:00:00 2001
From: sinake <sinake1@qq.com>
Date: 星期五, 03 七月 2026 15:39:39 +0800
Subject: [PATCH] 工作流伦理审查取错表数据处理
---
ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceDonatebaseinfoServiceImpl.java | 28 ++++++++++++++--------------
1 files changed, 14 insertions(+), 14 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 96e05bb..c5e6adc 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
@@ -398,15 +398,15 @@
//灏佽浼︾悊瀹℃煡
Map<String, String> donateflowcharts = new HashMap<>();
//if (serviceDonatebaseinfo.getWorkflow() >= 3) {
- ServiceEthicalreviewopinions serviceDonateflowchart = new ServiceEthicalreviewopinions();
+ ServiceEthicalreviewinitiate serviceDonateflowchart = new ServiceEthicalreviewinitiate();
serviceDonateflowchart.setInfoid(id);
- List<ServiceEthicalreviewopinions> serviceEthicalreviewopinionsList = iServiceEthicalreviewopinionsService.queryList(serviceDonateflowchart);
+ List<ServiceEthicalreviewinitiate> serviceEthicalreviewopinionsList = iServiceEthicalreviewinitiateService.queryList(serviceDonateflowchart);
log.info("妫�鏌erviceEthicalreviewopinionsList鐨勫�间负锛歿}", serviceEthicalreviewopinionsList.size());
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);
- donateflowcharts.put("state", StringUtils.nullTo1(serviceEthicalreviewopinionsList.get(0).getReceiveStatus()));
+ donateflowcharts.put("state", StringUtils.nullTo1(serviceEthicalreviewopinionsList.get(0).getStatus()));
if (StringUtils.isNotBlank(serviceEthicalreviewopinionsList.get(0).getCreateBy())) {
SysUser sysUser = sysUserMapper.selectUserByUserName(serviceEthicalreviewopinionsList.get(0).getCreateBy());
if (!ObjectUtils.isEmpty(sysUser)) {
@@ -432,25 +432,25 @@
//灏佽鍣ㄥ畼鍒嗛厤
Map<String, Object> donateorgansService = new HashMap<>();
// if (serviceDonatebaseinfo.getWorkflow() >= 4) {
- ServiceDonateorgan serviceDonateorgan = new ServiceDonateorgan();
+ ServiceDonateorganBase serviceDonateorgan = new ServiceDonateorganBase();
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()) : "");
+ Page<ServiceDonateorganBase> serviceDonateorgans = serviceDonateorganBaseService.queryList(serviceDonateorgan);
+ log.info("妫�鏌erviceDonateorgans鐨勫�间负锛歿}", serviceDonateorgans.getRecords().size());
+ if (serviceDonateorgans.getRecords().size()>0) {
+ donateorgansService.put("createtime", DateUtils.parseDateToStr("yyyy-MM-dd HH:mm:ss", serviceDonateorgans.getRecords().get(0).getCreateTime()));
+ donateorgansService.put("updatetime", serviceDonateorgans.getRecords().get(0).getUpdateTime() != null ? DateUtils.parseDateToStr("yyyy-MM-dd HH:mm:ss", serviceDonateorgans.getRecords().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());
+ donateorgansService.put("state", StringUtils.nullTo1(serviceDonateorgans.getRecords().get(0).getAllocationStatus()));
+ if (StringUtils.isNotBlank(serviceDonateorgans.getRecords().get(0).getCreateBy())) {
+ SysUser sysUser = sysUserMapper.selectUserByUserName(serviceDonateorgans.getRecords().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 (StringUtils.isNotBlank(serviceDonateorgans.getRecords().get(0).getUpdateBy())) {
+ SysUser sysUser = sysUserMapper.selectUserByUserName(serviceDonateorgans.getRecords().get(0).getUpdateBy());
if (!ObjectUtils.isEmpty(sysUser)) {
donateorgansService.put("updateperson", sysUser.getNickName());
}
--
Gitblit v1.9.3