From 70a8659a911f9036f25e47552679e8cb9c80d5b2 Mon Sep 17 00:00:00 2001
From: sinake <sinake1@qq.com>
Date: 星期六, 25 四月 2026 10:13:35 +0800
Subject: [PATCH] 捐献器官分配附件处理
---
ruoyi-project/src/main/java/com/ruoyi/project/domain/dto/DonateorganBaseInfoDTO.java | 19 +++++++++++++++++++
ruoyi-project/src/main/resources/mapper/project/ServiceDonateorganBaseMapper.xml | 16 +++++++++++++---
ruoyi-project/src/main/java/com/ruoyi/project/domain/vo/ServiceDonateorganBaseVO.java | 15 +++++++++++++++
3 files changed, 47 insertions(+), 3 deletions(-)
diff --git a/ruoyi-project/src/main/java/com/ruoyi/project/domain/dto/DonateorganBaseInfoDTO.java b/ruoyi-project/src/main/java/com/ruoyi/project/domain/dto/DonateorganBaseInfoDTO.java
index aed3895..f953bde 100644
--- a/ruoyi-project/src/main/java/com/ruoyi/project/domain/dto/DonateorganBaseInfoDTO.java
+++ b/ruoyi-project/src/main/java/com/ruoyi/project/domain/dto/DonateorganBaseInfoDTO.java
@@ -171,5 +171,24 @@
*/
@ApiModelProperty("鎹愮尞澶氫釜鍣ㄥ畼璇︽儏绠＄悊鍒楄〃")
private List<ServiceDonateorgan> serviceDonateorganList;
+
+ @ApiModelProperty("棰勮鏃堕棿")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @Excel(name = "棰勮鏃堕棿", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
+ private Date EstimatedTime;
+
+ /**
+ * 闄勪欢
+ */
+ @ApiModelProperty("闄勪欢")
+ @Excel(name = "闄勪欢")
+ private String fileName;
+
+ /**
+ * 鎵╁睍
+ */
+ @ApiModelProperty("鎵╁睍")
+ @Excel(name = "鎵╁睍")
+ private String extContent;
}
diff --git a/ruoyi-project/src/main/java/com/ruoyi/project/domain/vo/ServiceDonateorganBaseVO.java b/ruoyi-project/src/main/java/com/ruoyi/project/domain/vo/ServiceDonateorganBaseVO.java
index c85f006..fdba22d 100644
--- a/ruoyi-project/src/main/java/com/ruoyi/project/domain/vo/ServiceDonateorganBaseVO.java
+++ b/ruoyi-project/src/main/java/com/ruoyi/project/domain/vo/ServiceDonateorganBaseVO.java
@@ -90,5 +90,20 @@
@ApiModelProperty("鍗曚釜鍣ㄥ畼绠＄悊鍒楄〃")
private List<ServiceDonateorgan> serviceDonateorganList;
+ /** 璁板綍鐘舵�� */
+ @ApiModelProperty("璁板綍鐘舵��")
+ @Excel(name = "璁板綍鐘舵��")
+ private String recordstate;
+
+ /** 闄勪欢璺緞,澶氬紶鐢�;鍙烽殧寮� */
+ @ApiModelProperty("闄勪欢璺緞,澶氬紶鐢�;鍙烽殧寮�")
+ @Excel(name = "闄勪欢璺緞,澶氬紶鐢�;鍙烽殧寮�")
+ private String fileName;
+
+ /** 鎵╁睍 */
+ @ApiModelProperty("鎵╁睍")
+ @Excel(name = "鎵╁睍")
+ private String extContent;
+
}
diff --git a/ruoyi-project/src/main/resources/mapper/project/ServiceDonateorganBaseMapper.xml b/ruoyi-project/src/main/resources/mapper/project/ServiceDonateorganBaseMapper.xml
index 218707c..7b7e3d4 100644
--- a/ruoyi-project/src/main/resources/mapper/project/ServiceDonateorganBaseMapper.xml
+++ b/ruoyi-project/src/main/resources/mapper/project/ServiceDonateorganBaseMapper.xml
@@ -76,9 +76,19 @@
sd.diagnosisname AS diagnosisname,
sd.id AS infoid,
sdb.ID AS id,
- sdb.registration_name AS registrationName,
- sdb.registration_time AS registrationTime,
- sdb.registration_code AS registrationCode
+ sdb.allocation_status,
+ sdb.allocation_time,
+ sdb.registration_code,
+ sdb.registration_name,
+ sdb.registration_time,
+ sdb.create_by,
+ sdb.create_time,
+ sdb.update_by,
+ sdb.update_time,
+ sdb.EstimatedTime as EstimatedTime,
+ sdb.recordstate as recordstate,
+ sdb.file_name,
+ sdb.ext_content
FROM
service_donatebaseinfo sd
LEFT JOIN service_donateorgan_base sdb ON sd.ID = sdb.InfoID and sd.del_flag = 0
--
Gitblit v1.9.3