From 2f13f59f023fba63aa993172d48c14bcaaafb233 Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期四, 16 五月 2024 13:53:34 +0800
Subject: [PATCH] 代码提交

---
 ruoyi-project/src/main/resources/mapper/project/ServiceDonationwitnessMapper.xml |    5 ++++-
 1 files changed, 4 insertions(+), 1 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..6071d8c 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`,
@@ -249,6 +250,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 &lt;= #{endtime}</if>
             <if test="city != null and city != ''">and o.City = #{city}</if>
@@ -268,4 +271,4 @@
     </select>
 
 
-</mapper>
\ No newline at end of file
+</mapper>

--
Gitblit v1.9.3