From 14cd7ee8f62d8b77fa1f0301d8cc9b9c83e0e63f Mon Sep 17 00:00:00 2001
From: sinake <sinake1@qq.com>
Date: 星期五, 24 四月 2026 09:19:50 +0800
Subject: [PATCH] 保存成功返回ID,姓名，上报人模糊查询
---
ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceRelativesconfirmation.java | 12 ++++++++++++
ruoyi-project/src/main/java/com/ruoyi/project/domain/dto/RelativeConfirmationBaseInfoDTO.java | 12 ++++++++++++
ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceTransportServiceImpl.java | 2 +-
ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceDonatebaseinfoReportFileServiceImpl.java | 1 +
ruoyi-project/src/main/resources/mapper/project/ServiceRelativesconfirmationMapper.xml | 6 +++++-
ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceDonatebaseinfoReportServiceImpl.java | 3 +++
6 files changed, 34 insertions(+), 2 deletions(-)
diff --git a/ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceRelativesconfirmation.java b/ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceRelativesconfirmation.java
index 74370cb..2b37356 100644
--- a/ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceRelativesconfirmation.java
+++ b/ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceRelativesconfirmation.java
@@ -288,6 +288,18 @@
* 瀹跺睘鎰忚澶囨敞
*/
@ApiModelProperty("瀹跺睘鎰忚澶囨敞")
+ private String relativeconfirmationsignname;
+
+ /**
+ * 浜插睘濮撳悕
+ */
+ @ApiModelProperty("浜插睘濮撳悕")
private String relativeRemark;
+
+ /**
+ * 浜插睘璇佷欢鍙�
+ */
+ @ApiModelProperty("浜插睘璇佷欢鍙�")
+ private String relativeidcardno;
}
diff --git a/ruoyi-project/src/main/java/com/ruoyi/project/domain/dto/RelativeConfirmationBaseInfoDTO.java b/ruoyi-project/src/main/java/com/ruoyi/project/domain/dto/RelativeConfirmationBaseInfoDTO.java
index 1dd1446..9a432ea 100644
--- a/ruoyi-project/src/main/java/com/ruoyi/project/domain/dto/RelativeConfirmationBaseInfoDTO.java
+++ b/ruoyi-project/src/main/java/com/ruoyi/project/domain/dto/RelativeConfirmationBaseInfoDTO.java
@@ -280,4 +280,16 @@
*/
@ApiModelProperty("瀹跺睘鎰忚澶囨敞")
private String relativeRemark;
+
+ /**
+ * 瀹跺睘鎰忚澶囨敞
+ */
+ @ApiModelProperty("浜插睘濮撳悕")
+ private String relativeconfirmationsignname;
+
+ /**
+ * 瀹跺睘鎰忚澶囨敞
+ */
+ @ApiModelProperty("浜插睘璇佷欢鍙�")
+ private String relativeidcardno;
}
diff --git a/ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceDonatebaseinfoReportFileServiceImpl.java b/ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceDonatebaseinfoReportFileServiceImpl.java
index 0192593..79a46d9 100644
--- a/ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceDonatebaseinfoReportFileServiceImpl.java
+++ b/ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceDonatebaseinfoReportFileServiceImpl.java
@@ -103,6 +103,7 @@
// 娣诲姞鏂扮殑璁板綍
for (ServiceDonatebaseinfoReportFile serviceDonatebaseinfoReportFile : serviceDonatebaseinfoReportFiles) {
if (StringUtils.isNotEmpty(serviceDonatebaseinfoReportFile.getFileName()) ) {
+ serviceDonatebaseinfoReportFile.setId(null);
serviceDonatebaseinfoReportFile.setUpdateBy(updateName);
serviceDonatebaseinfoReportFile.setUpdateTime(new Date());
serviceDonatebaseinfoReportFile.setCaseNo(caseNo);
diff --git a/ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceDonatebaseinfoReportServiceImpl.java b/ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceDonatebaseinfoReportServiceImpl.java
index d2eb5f4..dd539ff 100644
--- a/ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceDonatebaseinfoReportServiceImpl.java
+++ b/ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceDonatebaseinfoReportServiceImpl.java
@@ -121,10 +121,13 @@
//灏唕eport鏁版嵁澶嶅埗鍒皊erviceDonatebaseinfo涓�
ServiceDonatebaseinfo serviceDonatebaseinfo1 = DtoConversionUtils.sourceToTarget(serviceDonatebaseinfoReport, ServiceDonatebaseinfo.class);
serviceDonatebaseinfo1.setId(null);
+ serviceDonatebaseinfo1.setReportId(serviceDonatebaseinfoReport.getId());
serviceDonatebaseinfo1.setReporterno(serviceDonatebaseinfoReport.getCoordinatorNo());
serviceDonatebaseinfo1.setReportername(serviceDonatebaseinfoReport.getCoordinatorName());
serviceDonatebaseinfo1.setCurrentHospital(serviceDonatebaseinfoReport.getToHospital());
serviceDonatebaseinfo1.setReportername(serviceDonatebaseinfoReport.getCoordinatorName());
+ serviceDonatebaseinfo1.setBloodtype(serviceDonatebaseinfoReport.getBloodType());
+ serviceDonatebaseinfo1.setRhyin(serviceDonatebaseinfoReport.getRhYin());
//鍏堥�氳繃caseNo鏌ヨ鏄惁瀛樺湪
ServiceDonatebaseinfo serviceDonatebaseinfo = new ServiceDonatebaseinfo();
serviceDonatebaseinfo.setCaseNo(serviceDonatebaseinfoReport.getCaseNo());
diff --git a/ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceTransportServiceImpl.java b/ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceTransportServiceImpl.java
index f846cbb..4c2c8d1 100644
--- a/ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceTransportServiceImpl.java
+++ b/ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceTransportServiceImpl.java
@@ -57,7 +57,7 @@
for (ServiceTransport serviceTransport1 : list) {
ServiceTransportFile serviceTransportFile = new ServiceTransportFile();
serviceTransportFile.setDelFlag(0);
- serviceTransportFile.setTransportId(serviceTransport1.getReportId());
+ serviceTransportFile.setTransportId(serviceTransport1.getId());
serviceTransportFile.setCaseNo(serviceTransport1.getCaseNo());
List<ServiceTransportFile> serviceTransportFiles = serviceTransportFileService.queryList(serviceTransportFile);
diff --git a/ruoyi-project/src/main/resources/mapper/project/ServiceRelativesconfirmationMapper.xml b/ruoyi-project/src/main/resources/mapper/project/ServiceRelativesconfirmationMapper.xml
index d78ec28..70da649 100644
--- a/ruoyi-project/src/main/resources/mapper/project/ServiceRelativesconfirmationMapper.xml
+++ b/ruoyi-project/src/main/resources/mapper/project/ServiceRelativesconfirmationMapper.xml
@@ -52,6 +52,8 @@
<result property="occupation" column="occupation"/>
<result property="assessannex" column="assessannex"/>
<result property="relativeRemark" column="relative_remark"/>
+ <result property="relativeconfirmationsignname" column="relativeconfirmationsignname"/>
+ <result property="relativeidcardno" column="relativeidcardno"/>
</resultMap>
<sql id="selectServiceRelativesconfirmationVo">
@@ -303,7 +305,9 @@
sr.occupation as occupation,
sr.relative_remark as relativeRemark,
sr.assessannex as assessannex,
- sr.education as education
+ sr.education as education,
+ sr.relativeconfirmationsignname,
+ sr.relativeidcardno
FROM service_donatebaseinfo sd
LEFT JOIN service_relativesconfirmation sr ON sd.ID = sr.InfoID and sd.del_flag = 0
AND sr.del_flag = 0
--
Gitblit v1.9.3