From d91dfa2b823f6644f1e58dd4770f57e0d0cef08f Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期三, 20 三月 2024 17:51:39 +0800
Subject: [PATCH] 代码提交

---
 ruoyi-project/src/main/resources/mapper/project/ServiceDonationwitnessMapper.xml |    4 ++++
 1 files changed, 4 insertions(+), 0 deletions(-)

diff --git a/ruoyi-project/src/main/resources/mapper/project/ServiceDonationwitnessMapper.xml b/ruoyi-project/src/main/resources/mapper/project/ServiceDonationwitnessMapper.xml
index 03fbb1b..2feaa6e 100644
--- a/ruoyi-project/src/main/resources/mapper/project/ServiceDonationwitnessMapper.xml
+++ b/ruoyi-project/src/main/resources/mapper/project/ServiceDonationwitnessMapper.xml
@@ -119,6 +119,8 @@
         `service_donatebaseinfo`.`ReporterPhone` AS `ReporterPhone`,
         `service_donatebaseinfo`.`ReportTime` AS `ReportTime`,
         `service_donatebaseinfo`.`create_by` AS `basecreateby`,
+        `service_donatebaseinfo`.`workflow` AS `workflow`,
+        `service_donatebaseinfo`.`termination_case` AS `terminationCase`,
         `service_donationwitness`.`ID` AS `dwID`,
         `service_donationwitness`.`InfoID` AS `InfoID`,
         `service_donationwitness`.`DonorNo` AS `dwDonorNo`,
@@ -166,6 +168,7 @@
         `base_organization`.`OrganizationID` = `service_donatebaseinfo`.`TreatmentHospitalNo`
 
         <where>
+            service_donationwitness.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>
@@ -185,6 +188,7 @@
                 #{reporterno}
             </if>
             <if test="city != null and city != ''">and `base_organization`.`City` = #{city}</if>
+            <if test="workflow != null ">and `service_donatebaseinfo`.`workflow` = #{workflow}</if>
         </where>
 
         order by `service_donationwitness`.`create_time` desc

--
Gitblit v1.9.3