From 0028d554cb0dcae4d5250dac3d0f2a1e5d2f2da2 Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期三, 26 七月 2023 15:27:57 +0800
Subject: [PATCH] 修改字段

---
 ruoyi-project/src/main/resources/mapper/project/ServiceDonateorganMapper.xml |   17 ++++++++++++++---
 1 files changed, 14 insertions(+), 3 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..b903c57 100644
--- a/ruoyi-project/src/main/resources/mapper/project/ServiceDonateorganMapper.xml
+++ b/ruoyi-project/src/main/resources/mapper/project/ServiceDonateorganMapper.xml
@@ -4,7 +4,7 @@
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.ruoyi.project.mapper.ServiceDonateorganMapper">
     
-    <resultMap type="ServiceDonateorgan" id="ServiceDonateorganResult">
+    <resultMap type="com.ruoyi.project.domain.ServiceDonateorgan" id="ServiceDonateorganResult">
         <result property="id"    column="ID"    />
         <result property="infoid"    column="InfoID"    />
         <result property="donorno"    column="DonorNo"    />
@@ -39,7 +39,7 @@
         select ID, InfoID, DonorNo, OrganNo, OrganName, OrganState, OrganNumber, OrganGetTime, OrganGetDoct, GainHospitalNo, GainHospitalName, TransplantHospitalNo, TransplantHospitalName, TransplantDoct, TransplantTime, AbandonReason, ReallocationReason, IsBiopsyBefore, IsBiopsyAfter, IsMarginalOrgan, IsPathogenPositive, IsPNF, IsDGF, del_flag, create_by, create_time, update_by, update_time from service_donateorgan
     </sql>
 
-    <select id="selectServiceDonateorganList" parameterType="ServiceDonateorgan" resultMap="ServiceDonateorganResult">
+    <select id="selectServiceDonateorganList" parameterType="com.ruoyi.project.domain.ServiceDonateorgan" resultMap="ServiceDonateorganResult">
         <include refid="selectServiceDonateorganVo"/>
         <where>
             <if test="infoid != null "> and InfoID = #{infoid}</if>
@@ -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