From b9cc263b8d1d31608a4c16cd157cc84b51e3d29d Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期五, 02 八月 2024 18:11:24 +0800
Subject: [PATCH] 变更
---
ruoyi-project/src/main/resources/mapper/project/ServiceDonationwitnessMapper.xml | 8 +++++---
1 files changed, 5 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 2feaa6e..6e6900e 100644
--- a/ruoyi-project/src/main/resources/mapper/project/ServiceDonationwitnessMapper.xml
+++ b/ruoyi-project/src/main/resources/mapper/project/ServiceDonationwitnessMapper.xml
@@ -121,6 +121,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`,
@@ -160,15 +161,14 @@
`service_donationwitness`.`update_by` AS `updateby`,
`service_donationwitness`.`update_time` AS `updatetime`
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>
@@ -249,6 +249,8 @@
inner join service_donatebaseinfo b on w.InfoID = b.id
inner join base_organization o on b.TreatmentHospitalNo = o.OrganizationID
<where>
+ w.del_flag=0
+ and b.del_flag=0
<if test="starttime != null ">and w.OperationBegTime >= #{starttime}</if>
<if test="endtime != null ">and w.OperationBegTime <= #{endtime}</if>
<if test="city != null and city != ''">and o.City = #{city}</if>
@@ -268,4 +270,4 @@
</select>
-</mapper>
\ No newline at end of file
+</mapper>
--
Gitblit v1.9.3