From ec618414be82866a2047d5a83a417621b26c4aaa Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期五, 18 十月 2024 10:47:39 +0800
Subject: [PATCH] 代码提交

---
 ruoyi-project/src/main/resources/mapper/project/ServiceDonatebaseinfoMapper.xml |   14 +++++++++-----
 1 files changed, 9 insertions(+), 5 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..06d5f08 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>
@@ -203,8 +206,8 @@
             <if test="infoname != null ">and infoName = #{infoname}</if>
             <if test="infophone != null ">and infoPhone = #{infophone}</if>
             <if test="createBy != null ">and `service_donatebaseinfo`.create_by = #{createBy}</if>
-            <if test="starttime != null ">and ReportTime >= #{starttime}</if>
-            <if test="endtime != null ">and ReportTime &lt;= #{endtime}</if>
+            <if test="starttime != null ">and donatetime >= #{starttime}</if>
+            <if test="endtime != null ">and donatetime &lt;= #{endtime}</if>
             <if test="nativeplace != null  and nativeplace != ''">and NativePlace = #{nativeplace}</if>
             <if test="city != null and city != ''">and `base_organization`.`City` = #{city}</if>
             <if test="deptid != null ">and deptid = #{deptid}</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 &lt;= #{endtime}</if>
+            <if test="starttime != null ">and b.donatetime >= #{starttime}</if>
+            <if test="endtime != null ">and b.donatetime &lt;= #{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>
@@ -385,4 +389,4 @@
           AND d.OrganGetTime &lt;= #{endtime}
     </select>
 
-</mapper>
\ No newline at end of file
+</mapper>

--
Gitblit v1.9.3