From 2944ea778f0fc87c8e09ae47200d9de8069049e3 Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期五, 26 十二月 2025 10:46:37 +0800
Subject: [PATCH] 代码提交

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

diff --git a/ruoyi-project/src/main/resources/mapper/project/ServiceDonatebaseinfoMapper.xml b/ruoyi-project/src/main/resources/mapper/project/ServiceDonatebaseinfoMapper.xml
index c0d8a35..aee2e13 100644
--- a/ruoyi-project/src/main/resources/mapper/project/ServiceDonatebaseinfoMapper.xml
+++ b/ruoyi-project/src/main/resources/mapper/project/ServiceDonatebaseinfoMapper.xml
@@ -6,6 +6,7 @@
 
     <resultMap type="com.ruoyi.project.domain.ServiceDonatebaseinfo" id="ServiceDonatebaseinfoResult">
         <result property="id" column="ID"/>
+        <result property="caseNo" column="case_no"/>
         <result property="name" column="Name"/>
         <result property="sex" column="Sex"/>
         <result property="idcardtype" column="IDCardType"/>
@@ -85,6 +86,7 @@
         <result property="firstMedicalInstitution" column="first_medical_institution"/>
         <result property="currentDept" column="current_dept"/>
         <result property="firstDept" column="first_dept"/>
+        <result property="reportId" column="report_id"/>
     </resultMap>
 
     <sql id="selectServiceDonatebaseinfoVo">
@@ -106,6 +108,7 @@
             service_donatebaseinfo.del_flag = 0
             <if test="name != null  and name != ''">and Name like concat('%', #{name}, '%')</if>
             <if test="sex != null ">and Sex = #{sex}</if>
+            <if test="caseNo != null ">and service_donatebaseinfo.case_no = #{caseNo}</if>
             <if test="idcardtype != null ">and IDCardType = #{idcardtype}</if>
             <if test="idcardno != null  and idcardno != ''">and IDCardNo = #{idcardno}</if>
             <if test="age != null ">and Age = #{age}</if>
@@ -222,6 +225,7 @@
             <if test="donatetime != null ">and donatetime = #{donatetime}</if>
             <if test="donateno != null ">and donateno = #{donateno}</if>
             <if test="workflow != null ">and workflow = #{workflow}</if>
+            <if test="reportId != null ">and report_id = #{reportId}</if>
         </where>
 
         order by ReportTime desc
@@ -246,6 +250,8 @@
         <where>
             AND b.del_flag=0
             <if test="starttime != null ">and b.donatetime >= #{starttime}</if>
+            <if test="caseNo != null ">and b.case_no >= #{caseNo}</if>
+            <if test="reportId != null ">and b.report_id = #{reportId}</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>
@@ -282,6 +288,7 @@
         inner join base_organization o on b.TreatmentHospitalNo = o.OrganizationID
         <where>
             <if test="starttime != null ">and b.ReportTime >= #{starttime}</if>
+            <if test="caseNo != null ">and b.case_no >= #{caseNo}</if>
             <if test="endtime != null ">and b.ReportTime &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>
@@ -379,6 +386,7 @@
             <if test="endtime != null ">and d.CompleteTime &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>
+            <if test="caseNo != null ">and b.case_no >= #{caseNo}</if>
         </where>
     </select>
 

--
Gitblit v1.9.3