From 5c909da3050d2337015c0454d219d482add19a63 Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期三, 27 十二月 2023 18:53:57 +0800
Subject: [PATCH] 代码提交

---
 ruoyi-project/src/main/resources/mapper/project/ServiceDonorchargeorganMapper.xml |  108 +++++++++++++++++++++++++++++++++--------------------
 1 files changed, 67 insertions(+), 41 deletions(-)

diff --git a/ruoyi-project/src/main/resources/mapper/project/ServiceDonorchargeorganMapper.xml b/ruoyi-project/src/main/resources/mapper/project/ServiceDonorchargeorganMapper.xml
index 6f5d8a8..8be7cdc 100644
--- a/ruoyi-project/src/main/resources/mapper/project/ServiceDonorchargeorganMapper.xml
+++ b/ruoyi-project/src/main/resources/mapper/project/ServiceDonorchargeorganMapper.xml
@@ -1,53 +1,79 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE mapper
-PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
-"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.ruoyi.system.mapper.ServiceDonorchargeorganMapper">
-    
-    <resultMap type="ServiceDonorchargeorgan" id="ServiceDonorchargeorganResult">
-        <result property="id"    column="ID"    />
-        <result property="infoid"    column="InfoID"    />
-        <result property="donorname"    column="donorname"    />
-        <result property="hospitalname"    column="HospitalName"    />
-        <result property="hospitalno"    column="HospitalNo"    />
-        <result property="organno"    column="OrganNo"    />
-        <result property="organname"    column="OrganName"    />
-        <result property="organcharge"    column="organcharge"    />
-        <result property="organtime"    column="organtime"    />
-        <result property="chargeoperator"    column="chargeoperator"    />
-        <result property="amount"    column="amount"    />
-        <result property="amounttime"    column="amounttime"    />
-        <result property="amountoperator"    column="amountoperator"    />
-        <result property="chargestate"    column="chargestate"    />
-        <result property="organchargedesc"    column="organchargedesc"    />
-        <result property="delFlag"    column="del_flag"    />
-        <result property="createBy"    column="create_by"    />
-        <result property="createTime"    column="create_time"    />
-        <result property="updateBy"    column="update_by"    />
-        <result property="updateTime"    column="update_time"    />
+        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.ruoyi.project.mapper.ServiceDonorchargeorganMapper">
+
+    <resultMap type="com.ruoyi.project.domain.ServiceDonorchargeorgan" id="ServiceDonorchargeorganResult">
+        <result property="id" column="ID"/>
+        <result property="id" column="ID"/>
+        <result property="donorchargelD" column="donorchargelD"/>
+        <result property="donorname" column="donorname"/>
+        <result property="hospitalname" column="HospitalName"/>
+        <result property="hospitalno" column="HospitalNo"/>
+        <result property="organno" column="OrganNo"/>
+        <result property="organname" column="OrganName"/>
+        <result property="organcharge" column="organcharge"/>
+        <result property="organtime" column="organtime"/>
+        <result property="chargeoperator" column="chargeoperator"/>
+        <result property="amount" column="amount"/>
+        <result property="amounttime" column="amounttime"/>
+        <result property="amountoperator" column="amountoperator"/>
+        <result property="chargestate" column="chargestate"/>
+        <result property="organchargedesc" column="organchargedesc"/>
+        <result property="delFlag" column="del_flag"/>
+        <result property="createBy" column="create_by"/>
+        <result property="createTime" column="create_time"/>
+        <result property="updateBy" column="update_by"/>
+        <result property="updateTime" column="update_time"/>
     </resultMap>
 
     <sql id="selectServiceDonorchargeorganVo">
-        select ID, InfoID, donorname, HospitalName, HospitalNo, OrganNo, OrganName, organcharge, organtime, chargeoperator, amount, amounttime, amountoperator, chargestate, organchargedesc, del_flag, create_by, create_time, update_by, update_time from service_donorchargeorgan
+        select ID,
+               donorchargelD,
+               InfoID,
+               donorname,
+               HospitalName,
+               HospitalNo,
+               OrganNo,
+               OrganName,
+               organcharge,
+               organtime,
+               chargeoperator,
+               amount,
+               amounttime,
+               amountoperator,
+               chargestate,
+               organchargedesc,
+               del_flag,
+               create_by,
+               create_time,
+               update_by,
+               update_time
+        from service_donorchargeorgan
     </sql>
 
-    <select id="selectServiceDonorchargeorganList" parameterType="ServiceDonorchargeorgan" resultMap="ServiceDonorchargeorganResult">
+    <select id="selectServiceDonorchargeorganList" parameterType="com.ruoyi.project.domain.ServiceDonorchargeorgan"
+            resultMap="ServiceDonorchargeorganResult">
         <include refid="selectServiceDonorchargeorganVo"/>
         <where>
-            <if test="infoid != null "> and InfoID = #{infoid}</if>
-            <if test="donorname != null  and donorname != ''"> and donorname like concat('%', #{donorname}, '%')</if>
-            <if test="hospitalname != null  and hospitalname != ''"> and HospitalName like concat('%', #{hospitalname}, '%')</if>
-            <if test="hospitalno != null  and hospitalno != ''"> and HospitalNo = #{hospitalno}</if>
-            <if test="organno != null  and organno != ''"> and OrganNo = #{organno}</if>
-            <if test="organname != null  and organname != ''"> and OrganName like concat('%', #{organname}, '%')</if>
-            <if test="organcharge != null "> and organcharge = #{organcharge}</if>
-            <if test="organtime != null "> and organtime = #{organtime}</if>
-            <if test="chargeoperator != null  and chargeoperator != ''"> and chargeoperator = #{chargeoperator}</if>
-            <if test="amount != null "> and amount = #{amount}</if>
-            <if test="amounttime != null "> and amounttime = #{amounttime}</if>
-            <if test="amountoperator != null  and amountoperator != ''"> and amountoperator = #{amountoperator}</if>
-            <if test="chargestate != null "> and chargestate = #{chargestate}</if>
-            <if test="organchargedesc != null  and organchargedesc != ''"> and organchargedesc = #{organchargedesc}</if>
+            <if test="infoid != null ">and InfoID = #{infoid}</if>
+            <if test="donorchargelD != null ">and donorchargelD = #{donorchargelD}</if>
+            <if test="donorname != null  and donorname != ''">and donorname like concat('%', #{donorname}, '%')</if>
+            <if test="hospitalname != null  and hospitalname != ''">and HospitalName like concat('%', #{hospitalname},
+                '%')
+            </if>
+            <if test="hospitalno != null  and hospitalno != ''">and HospitalNo = #{hospitalno}</if>
+            <if test="organno != null  and organno != ''">and OrganNo = #{organno}</if>
+            <if test="organname != null  and organname != ''">and OrganName like concat('%', #{organname}, '%')</if>
+            <if test="organcharge != null ">and organcharge = #{organcharge}</if>
+            <if test="organtime != null ">and organtime = #{organtime}</if>
+            <if test="chargeoperator != null  and chargeoperator != ''">and chargeoperator = #{chargeoperator}</if>
+            <if test="amount != null ">and amount = #{amount}</if>
+            <if test="amounttime != null ">and amounttime = #{amounttime}</if>
+            <if test="amountoperator != null  and amountoperator != ''">and amountoperator = #{amountoperator}</if>
+            <if test="chargestate != null ">and chargestate = #{chargestate}</if>
+            <if test="organchargedesc != null  and organchargedesc != ''">and organchargedesc = #{organchargedesc}</if>
         </where>
     </select>
 

--
Gitblit v1.9.3