From 4e6474371f5da1ba148dd0f9da7a0927f0e5a74b Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期三, 26 六月 2024 10:18:55 +0800
Subject: [PATCH] 变更
---
ruoyi-project/src/main/resources/mapper/project/ServiceDonationwitnessMapper.xml | 9 ++++++++-
1 files changed, 8 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 03fbb1b..6071d8c 100644
--- a/ruoyi-project/src/main/resources/mapper/project/ServiceDonationwitnessMapper.xml
+++ b/ruoyi-project/src/main/resources/mapper/project/ServiceDonationwitnessMapper.xml
@@ -119,6 +119,9 @@
`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_donatebaseinfo`.`donatetime` AS `donatetime`,
`service_donationwitness`.`ID` AS `dwID`,
`service_donationwitness`.`InfoID` AS `InfoID`,
`service_donationwitness`.`DonorNo` AS `dwDonorNo`,
@@ -166,6 +169,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 +189,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
@@ -245,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 <= #{endtime}</if>
<if test="city != null and city != ''">and o.City = #{city}</if>
@@ -264,4 +271,4 @@
</select>
-</mapper>
\ No newline at end of file
+</mapper>
--
Gitblit v1.9.3