From 39405c053391f29d2f2c0e2c3104bea111e0e460 Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期三, 08 五月 2024 10:25:31 +0800
Subject: [PATCH] 代码提交
---
ruoyi-project/src/main/resources/mapper/project/ServiceDonatebaseinfoMapper.xml | 8 ++++++--
1 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/ruoyi-project/src/main/resources/mapper/project/ServiceDonatebaseinfoMapper.xml b/ruoyi-project/src/main/resources/mapper/project/ServiceDonatebaseinfoMapper.xml
index aebc9b9..4f0776f 100644
--- a/ruoyi-project/src/main/resources/mapper/project/ServiceDonatebaseinfoMapper.xml
+++ b/ruoyi-project/src/main/resources/mapper/project/ServiceDonatebaseinfoMapper.xml
@@ -113,6 +113,9 @@
<if test="residenceprovince != null and residenceprovince != ''">and ResidenceProvince =
#{residenceprovince}
</if>
+ <if test="terminationCase != null">and termination_case =
+ #{terminationCase}
+ </if>
<if test="residenceprovincename != null and residenceprovincename != ''">and ResidenceProvinceName like
concat('%', #{residenceprovincename}, '%')
</if>
@@ -214,6 +217,7 @@
<if test="businessarea != null ">and businessarea = #{businessarea}</if>
<if test="donatetime != null ">and donatetime = #{donatetime}</if>
<if test="donateno != null ">and donateno = #{donateno}</if>
+ <if test="workflow != null ">and workflow = #{workflow}</if>
</where>
order by ReportTime desc
@@ -237,8 +241,8 @@
inner join base_organization o on b.TreatmentHospitalNo = o.OrganizationID
<where>
AND b.del_flag=0
- <if test="starttime != null ">and b.ReportTime >= #{starttime}</if>
- <if test="endtime != null ">and b.ReportTime <= #{endtime}</if>
+ <if test="starttime != null ">and b.donatetime >= #{starttime}</if>
+ <if test="endtime != null ">and b.donatetime <= #{endtime}</if>
<if test="city != null and city != ''">and o.City = #{city}</if>
<if test="reporterno != null and reporterno != ''">and b.ReporterNo = #{reporterno}</if>
</where>
--
Gitblit v1.9.3