From 22655ad10d386f0fc3c38389f519d3d188b46f19 Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期五, 13 十月 2023 16:29:54 +0800
Subject: [PATCH] 代码提交

---
 ruoyi-project/src/main/resources/mapper/project/ServiceReimbursementdetailSharedMapper.xml |  195 ++++++++++++++++++++++++++++++------------------
 1 files changed, 121 insertions(+), 74 deletions(-)

diff --git a/ruoyi-project/src/main/resources/mapper/project/ServiceReimbursementdetailSharedMapper.xml b/ruoyi-project/src/main/resources/mapper/project/ServiceReimbursementdetailSharedMapper.xml
index 046171e..6f5a736 100644
--- a/ruoyi-project/src/main/resources/mapper/project/ServiceReimbursementdetailSharedMapper.xml
+++ b/ruoyi-project/src/main/resources/mapper/project/ServiceReimbursementdetailSharedMapper.xml
@@ -1,87 +1,134 @@
 <?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">
+        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.ruoyi.project.mapper.ServiceReimbursementdetailSharedMapper">
-    
-    <resultMap type="com.ruoyi.project.domain.ServiceReimbursementdetailShared" id="ServiceReimbursementdetailSharedResult">
-        <result property="id"    column="ID"    />
-        <result property="rbid"    column="RBID"    />
-        <result property="persontype"    column="persontype"    />
-        <result property="personname"    column="personname"    />
-        <result property="orderno"    column="OrderNo"    />
-        <result property="starttime"    column="StartTime"    />
-        <result property="departure"    column="Departure"    />
-        <result property="endtime"    column="EndTime"    />
-        <result property="destination"    column="Destination"    />
-        <result property="days"    column="Days"    />
-        <result property="trafficexpense"    column="TrafficExpense"    />
-        <result property="traffictype"    column="TrafficType"    />
-        <result property="cityfee"    column="CityFee"    />
-        <result property="hotelexpense"    column="HotelExpense"    />
-        <result property="invoicecount"    column="InvoiceCount"    />
-        <result property="attachcount"    column="AttachCount"    />
-        <result property="otherexpense"    column="OtherExpense"    />
-        <result property="foodexpenses"    column="FoodExpenses"    />
-        <result property="foodallowance"    column="FoodAllowance"    />
-        <result property="annexfiles"    column="AnnexFiles"    />
-        <result property="remark"    column="Remark"    />
-        <result property="del_flag"    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"    />
-        <result property="uploadFlag"    column="upload_flag"    />
-        <result property="uploadTime"    column="upload_time"    />
-        <result property="travelprovince"    column="travelprovince"    />
-        <result property="travelprovincename"    column="travelprovincename"    />
-        <result property="travelcity"    column="travelcity"    />
-        <result property="travelcityname"    column="travelcityname"    />
-        <result property="traveltown"    column="traveltown"    />
-        <result property="traveltownname"    column="traveltownname"    />
-        <result property="otherfeeamount"    column="otherfeeamount"    />
-        <result property="otherfeedesc"    column="otherfeedesc"    />
+
+    <resultMap type="com.ruoyi.project.domain.ServiceReimbursementdetailShared"
+               id="ServiceReimbursementdetailSharedResult">
+        <result property="id" column="ID"/>
+        <result property="rbid" column="RBID"/>
+        <result property="persontype" column="persontype"/>
+        <result property="personname" column="personname"/>
+        <result property="orderno" column="OrderNo"/>
+        <result property="starttime" column="StartTime"/>
+        <result property="departure" column="Departure"/>
+        <result property="endtime" column="EndTime"/>
+        <result property="destination" column="Destination"/>
+        <result property="days" column="Days"/>
+        <result property="trafficexpense" column="TrafficExpense"/>
+        <result property="traffictype" column="TrafficType"/>
+        <result property="cityfee" column="CityFee"/>
+        <result property="hotelexpense" column="HotelExpense"/>
+        <result property="invoicecount" column="InvoiceCount"/>
+        <result property="attachcount" column="AttachCount"/>
+        <result property="otherexpense" column="OtherExpense"/>
+        <result property="foodexpenses" column="FoodExpenses"/>
+        <result property="foodallowance" column="FoodAllowance"/>
+        <result property="annexfiles" column="AnnexFiles"/>
+        <result property="invoicefiles" column="InvoiceFiles"/>
+        <result property="remark" column="Remark"/>
+        <result property="del_flag" 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"/>
+        <result property="uploadFlag" column="upload_flag"/>
+        <result property="uploadTime" column="upload_time"/>
+        <result property="travelprovince" column="travelprovince"/>
+        <result property="travelprovincename" column="travelprovincename"/>
+        <result property="travelcity" column="travelcity"/>
+        <result property="travelcityname" column="travelcityname"/>
+        <result property="traveltown" column="traveltown"/>
+        <result property="traveltownname" column="traveltownname"/>
+        <result property="otherfeeamount" column="otherfeeamount"/>
+        <result property="otherfeedesc" column="otherfeedesc"/>
     </resultMap>
 
     <sql id="selectServiceReimbursementdetailSharedVo">
-        select ID, RBID, persontype, personname, OrderNo, StartTime, Departure, EndTime, Destination, Days, TrafficExpense, TrafficType, CityFee, HotelExpense, InvoiceCount, AttachCount, OtherExpense, FoodExpenses, FoodAllowance, AnnexFiles, Remark, del_flag, create_by, create_time, update_by, update_time, upload_flag, upload_time, travelprovince, travelprovincename, travelcity, travelcityname, traveltown, traveltownname, otherfeeamount, otherfeedesc from service_reimbursementdetail_shared
+        select ID,
+               RBID,
+               persontype,
+               personname,
+               OrderNo,
+               StartTime,
+               Departure,
+               EndTime,
+               Destination,
+               Days,
+               TrafficExpense,
+               TrafficType,
+               CityFee,
+               HotelExpense,
+               InvoiceCount,
+               AttachCount,
+               OtherExpense,
+               FoodExpenses,
+               FoodAllowance,
+               AnnexFiles,
+               invoicefiles,
+               Remark,
+               del_flag,
+               create_by,
+               create_time,
+               update_by,
+               update_time,
+               upload_flag,
+               upload_time,
+               travelprovince,
+               travelprovincename,
+               travelcity,
+               travelcityname,
+               traveltown,
+               traveltownname,
+               otherfeeamount,
+               otherfeedesc
+        from service_reimbursementdetail_shared
     </sql>
 
-    <select id="selectServiceReimbursementdetailSharedList" parameterType="com.ruoyi.project.domain.ServiceReimbursementdetailShared" resultMap="ServiceReimbursementdetailSharedResult">
+    <select id="selectServiceReimbursementdetailSharedList"
+            parameterType="com.ruoyi.project.domain.ServiceReimbursementdetailShared"
+            resultMap="ServiceReimbursementdetailSharedResult">
         <include refid="selectServiceReimbursementdetailSharedVo"/>
         <where>
-            <if test="rbid != null "> and RBID = #{rbid}</if>
-            <if test="persontype != null  and persontype != ''"> and persontype = #{persontype}</if>
-            <if test="personname != null  and personname != ''"> and personname like concat('%', #{personname}, '%')</if>
-            <if test="orderno != null "> and OrderNo = #{orderno}</if>
-            <if test="starttime != null "> and StartTime = #{starttime}</if>
-            <if test="departure != null  and departure != ''"> and Departure = #{departure}</if>
-            <if test="endtime != null "> and EndTime = #{endtime}</if>
-            <if test="destination != null  and destination != ''"> and Destination = #{destination}</if>
-            <if test="days != null "> and Days = #{days}</if>
-            <if test="trafficexpense != null "> and TrafficExpense = #{trafficexpense}</if>
-            <if test="traffictype != null  and traffictype != ''"> and TrafficType = #{traffictype}</if>
-            <if test="cityfee != null "> and CityFee = #{cityfee}</if>
-            <if test="hotelexpense != null "> and HotelExpense = #{hotelexpense}</if>
-            <if test="invoicecount != null "> and InvoiceCount = #{invoicecount}</if>
-            <if test="attachcount != null "> and AttachCount = #{attachcount}</if>
-            <if test="otherexpense != null "> and OtherExpense = #{otherexpense}</if>
-            <if test="foodexpenses != null "> and FoodExpenses = #{foodexpenses}</if>
-            <if test="foodallowance != null "> and FoodAllowance = #{foodallowance}</if>
-            <if test="annexfiles != null  and annexfiles != ''"> and AnnexFiles = #{annexfiles}</if>
-            <if test="remark != null  and remark != ''"> and Remark = #{remark}</if>
-            <if test="uploadFlag != null  and uploadFlag != ''"> and upload_flag = #{uploadFlag}</if>
-            <if test="uploadTime != null "> and upload_time = #{uploadTime}</if>
-            <if test="travelprovince != null  and travelprovince != ''"> and travelprovince = #{travelprovince}</if>
-            <if test="travelprovincename != null  and travelprovincename != ''"> and travelprovincename like concat('%', #{travelprovincename}, '%')</if>
-            <if test="travelcity != null  and travelcity != ''"> and travelcity = #{travelcity}</if>
-            <if test="travelcityname != null  and travelcityname != ''"> and travelcityname like concat('%', #{travelcityname}, '%')</if>
-            <if test="traveltown != null  and traveltown != ''"> and traveltown = #{traveltown}</if>
-            <if test="traveltownname != null  and traveltownname != ''"> and traveltownname like concat('%', #{traveltownname}, '%')</if>
-            <if test="otherfeeamount != null "> and otherfeeamount = #{otherfeeamount}</if>
-            <if test="otherfeedesc != null  and otherfeedesc != ''"> and otherfeedesc = #{otherfeedesc}</if>
-            <if test="jine != null  and jine != ''"> and jine = #{jine}</if>
-            <if test="liyou != null  and liyou != ''"> and liyou = #{liyou}</if>
+            <if test="rbid != null ">and RBID = #{rbid}</if>
+            <if test="persontype != null  and persontype != ''">and persontype = #{persontype}</if>
+            <if test="personname != null  and personname != ''">and personname like concat('%', #{personname}, '%')</if>
+            <if test="orderno != null ">and OrderNo = #{orderno}</if>
+            <if test="starttime != null ">and StartTime = #{starttime}</if>
+            <if test="departure != null  and departure != ''">and Departure = #{departure}</if>
+            <if test="endtime != null ">and EndTime = #{endtime}</if>
+            <if test="destination != null  and destination != ''">and Destination = #{destination}</if>
+            <if test="days != null ">and Days = #{days}</if>
+            <if test="trafficexpense != null ">and TrafficExpense = #{trafficexpense}</if>
+            <if test="traffictype != null  and traffictype != ''">and TrafficType = #{traffictype}</if>
+            <if test="cityfee != null ">and CityFee = #{cityfee}</if>
+            <if test="hotelexpense != null ">and HotelExpense = #{hotelexpense}</if>
+            <if test="invoicecount != null ">and InvoiceCount = #{invoicecount}</if>
+            <if test="attachcount != null ">and AttachCount = #{attachcount}</if>
+            <if test="otherexpense != null ">and OtherExpense = #{otherexpense}</if>
+            <if test="foodexpenses != null ">and FoodExpenses = #{foodexpenses}</if>
+            <if test="foodallowance != null ">and FoodAllowance = #{foodallowance}</if>
+            <if test="annexfiles != null  and annexfiles != ''">and AnnexFiles = #{annexfiles}</if>
+            <if test="remark != null  and remark != ''">and Remark = #{remark}</if>
+            <if test="uploadFlag != null  and uploadFlag != ''">and upload_flag = #{uploadFlag}</if>
+            <if test="uploadTime != null ">and upload_time = #{uploadTime}</if>
+            <if test="travelprovince != null  and travelprovince != ''">and travelprovince = #{travelprovince}</if>
+            <if test="travelprovincename != null  and travelprovincename != ''">and travelprovincename like concat('%',
+                #{travelprovincename}, '%')
+            </if>
+            <if test="travelcity != null  and travelcity != ''">and travelcity = #{travelcity}</if>
+            <if test="travelcityname != null  and travelcityname != ''">and travelcityname like concat('%',
+                #{travelcityname}, '%')
+            </if>
+            <if test="traveltown != null  and traveltown != ''">and traveltown = #{traveltown}</if>
+            <if test="traveltownname != null  and traveltownname != ''">and traveltownname like concat('%',
+                #{traveltownname}, '%')
+            </if>
+            <if test="otherfeeamount != null ">and otherfeeamount = #{otherfeeamount}</if>
+            <if test="otherfeedesc != null  and otherfeedesc != ''">and otherfeedesc = #{otherfeedesc}</if>
+            <if test="jine != null  and jine != ''">and jine = #{jine}</if>
+            <if test="liyou != null  and liyou != ''">and liyou = #{liyou}</if>
         </where>
     </select>
 

--
Gitblit v1.9.3