From 4a54dc2ce371d90d19b264238c32efc7b871c772 Mon Sep 17 00:00:00 2001
From: sinake <sinake1@qq.com>
Date: 星期五, 03 七月 2026 15:32:34 +0800
Subject: [PATCH] 获取捐献工作流捐献器官分配状态取错表处理
---
ruoyi-admin/src/main/resources/application-druid.yml | 2 +-
ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceDonatebaseinfoServiceImpl.java | 22 +++++++++++-----------
2 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/ruoyi-admin/src/main/resources/application-druid.yml b/ruoyi-admin/src/main/resources/application-druid.yml
index 36c81db..0f467ee 100644
--- a/ruoyi-admin/src/main/resources/application-druid.yml
+++ b/ruoyi-admin/src/main/resources/application-druid.yml
@@ -69,7 +69,7 @@
multi-statement-allow: true
redis:
# 鍦板潃銆佸瘑鐮併�佺鍙ｏ紙榛樿涓�6379锛夛細寮�鍙戠幆澧�
- host: 127.0.0.1
+ host: 192.168.100.10
password: Smartor
port: 6020
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..ec6ea0c 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
@@ -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