From c78537d72205faa764fa4ea0858b7c484728a949 Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期五, 11 七月 2025 18:10:54 +0800
Subject: [PATCH] 代码提交
---
ruoyi-project/src/main/resources/mapper/project/ServiceDonationwitnessMapper.xml | 18 +++++++++++++++---
1 files changed, 15 insertions(+), 3 deletions(-)
diff --git a/ruoyi-project/src/main/resources/mapper/project/ServiceDonationwitnessMapper.xml b/ruoyi-project/src/main/resources/mapper/project/ServiceDonationwitnessMapper.xml
index 3c78bbc..71e71ab 100644
--- a/ruoyi-project/src/main/resources/mapper/project/ServiceDonationwitnessMapper.xml
+++ b/ruoyi-project/src/main/resources/mapper/project/ServiceDonationwitnessMapper.xml
@@ -43,11 +43,19 @@
<result property="organdonation" column="OrganDonation"/>
<result property="organdonationOther" column="OrganDonation_Other"/>
<result property="donationcategory" column="DonationCategory"/>
+ <result property="coordinatorInOperating" column="coordinator_in_operating"/>
+ <result property="coordinatorOutOperating" column="coordinator_out_operating"/>
+ <result property="coordinatorSign" column="coordinator_sign"/>
+ <result property="coordinatorSignTime" column="coordinator_sign_time"/>
</resultMap>
<sql id="selectServiceDonationwitnessVo">
select ID,
InfoID,
+ coordinator_in_operating,
+ coordinator_out_operating,
+ coordinator_sign,
+ coordinator_sign_time,
DonorNo,
GainHospitalNo,
GainHospitalName,
@@ -121,6 +129,7 @@
`service_donatebaseinfo`.`create_by` AS `basecreateby`,
`service_donatebaseinfo`.`workflow` AS `workflow`,
`service_donatebaseinfo`.`termination_case` AS `terminationCase`,
+ `service_donatebaseinfo`.`donatetime` AS `donatetime`,
`service_donationwitness`.`ID` AS `dwID`,
`service_donationwitness`.`InfoID` AS `InfoID`,
`service_donationwitness`.`DonorNo` AS `dwDonorNo`,
@@ -159,16 +168,19 @@
`service_donationwitness`.`create_time` AS `createtime`,
`service_donationwitness`.`update_by` AS `updateby`,
`service_donationwitness`.`update_time` AS `updatetime`
+ `service_donationwitness`.`coordinator_in_operating` AS `coordinatorInOperating`
+ `service_donationwitness`.`coordinator_out_operating` AS `coordinatorOutOperating`
+ `service_donationwitness`.`coordinator_sign` AS `coordinatorSign`
+ `service_donationwitness`.`coordinator_sign_time` AS `coordinatorSignTime`
FROM
-
`service_donatebaseinfo`
LEFT JOIN `service_donationwitness` ON
`service_donatebaseinfo`.`ID` = `service_donationwitness`.`InfoID`
LEFT JOIN `base_organization` ON
`base_organization`.`OrganizationID` = `service_donatebaseinfo`.`TreatmentHospitalNo`
-
<where>
service_donationwitness.del_flag=0
+ and service_donatebaseinfo.del_flag=0
<if test="donorno != null and donorno != ''">and `service_donatebaseinfo`.`DonorNo` = #{donorno}</if>
<if test="name != null and name != ''">and `service_donatebaseinfo`.`Name` like concat('%', #{name}, '%')
</if>
@@ -270,4 +282,4 @@
</select>
-</mapper>
\ No newline at end of file
+</mapper>
--
Gitblit v1.9.3