From 28c168589258f36b31fdb39add938e564804b3b1 Mon Sep 17 00:00:00 2001
From: yxh <172933527@qq.com>
Date: 星期一, 13 三月 2023 20:01:39 +0800
Subject: [PATCH] Default Changelist

---
 ruoyi-project/src/main/resources/mapper/project/ServiceDonateorganMapper.xml |   13 ++++++++++++-
 1 files changed, 12 insertions(+), 1 deletions(-)

diff --git a/ruoyi-project/src/main/resources/mapper/project/ServiceDonateorganMapper.xml b/ruoyi-project/src/main/resources/mapper/project/ServiceDonateorganMapper.xml
index 0c156b4..438243b 100644
--- a/ruoyi-project/src/main/resources/mapper/project/ServiceDonateorganMapper.xml
+++ b/ruoyi-project/src/main/resources/mapper/project/ServiceDonateorganMapper.xml
@@ -297,7 +297,10 @@
         `service_donateorgan`.`create_by` AS `create_by`,
         `service_donateorgan`.`create_time` AS `create_time`,
         `service_donateorgan`.`update_by` AS `update_by`,
-        `service_donateorgan`.`update_time` AS `update_time`
+        `service_donateorgan`.`update_time` AS `update_time`,
+        `service_donatebaseinfo`.`leadername` AS `leadername`,
+        `service_donatebaseinfo`.`leaderno` AS `leaderno`,
+        `service_donatebaseinfo`.`businessarea` AS `businessarea`
     FROM
         (
             `service_donatebaseinfo`
@@ -317,6 +320,14 @@
             <if test="transplanthospitalno != null  and transplanthospitalno != ''"> and `service_donateorgan`.`TransplantHospitalNo` = #{transplanthospitalno}</if>
             <if test="transplanthospitalname != null  and transplanthospitalname != ''"> and `service_donateorgan`.`TransplantHospitalName` = #{transplanthospitalname}</if>
             <if test="organstate != null  and organstate != ''"> and `service_donateorgan`.`OrganState` = #{organstate}</if>
+            <if test="reportername != null  and reportername != ''"> and `service_donatebaseinfo`.`ReporterName` = #{reportername}</if>
+            <if test="leadername != null  and leadername != ''"> and `service_donatebaseinfo`.`leadername` = #{leadername}</if>
+            <if test="leaderno != null  and leaderno != ''"> and `service_donatebaseinfo`.`leaderno` = #{leaderno}</if>
+            <if test="businessarea != null  and businessarea != ''"> and `service_donatebaseinfo`.`businessarea` = #{businessarea}</if>
+            <if test="gainHospitalname != null  and gainHospitalname != ''"> and `service_donateorgan`.`GainHospitalName` = #{gainHospitalname}</if>
+            <if test="treatmenthospitalname != null  and treatmenthospitalname != ''"> and `service_donatebaseinfo`.`TreatmentHospitalName` = #{treatmenthospitalname}</if>
+            <if test="startorgangettime != null  and endorgangettime != null "> and `service_donateorgan`.`OrganGetTime` >= #{startorgangettime} and `service_donateorgan`.`OrganGetTime`  &lt;=  #{endorgangettime} </if>
+            <if test="starttransplanttime != null  and endtransplanttime != null  ">  and `service_donateorgan`.`TransplantTime` >= #{starttransplanttime} and  `service_donateorgan`.`TransplantTime` &lt;= #{endtransplanttime}</if>
 
         </where>
     </select>

--
Gitblit v1.9.3