From b9cc263b8d1d31608a4c16cd157cc84b51e3d29d Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期五, 02 八月 2024 18:11:24 +0800
Subject: [PATCH] 变更
---
ruoyi-project/src/main/resources/mapper/project/ServiceReimbursementMapper.xml | 243 ++++++++++++++++++++++++++++++++++-------------
1 files changed, 174 insertions(+), 69 deletions(-)
diff --git a/ruoyi-project/src/main/resources/mapper/project/ServiceReimbursementMapper.xml b/ruoyi-project/src/main/resources/mapper/project/ServiceReimbursementMapper.xml
index a17f909..cf33948 100644
--- a/ruoyi-project/src/main/resources/mapper/project/ServiceReimbursementMapper.xml
+++ b/ruoyi-project/src/main/resources/mapper/project/ServiceReimbursementMapper.xml
@@ -1,95 +1,170 @@
<?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.ServiceReimbursementMapper">
-
- <resultMap type="ServiceReimbursement" id="ServiceReimbursementResult">
- <result property="id" column="ID" />
- <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" />
- <result property="userno" column="UserNo" />
- <result property="username" column="UserName" />
- <result property="idcardtype" column="IDCardType" />
- <result property="idcardno" column="IDCardNo" />
- <result property="phone" column="Phone" />
- <result property="depositbank" column="DepositBank" />
- <result property="bankcardno" column="BankCardNo" />
- <result property="branchbankname" column="BranchBankName" />
- <result property="annexbankcard" column="AnnexBankCard" />
- <result property="annexfiles" column="AnnexFiles" />
- <result property="amountrequested" column="AmountRequested" />
- <result property="prepaidamount" column="PrepaidAmount" />
- <result property="invoicecount" column="InvoiceCount" />
- <result property="attachcount" column="AttachCount" />
- <result property="managerno" column="ManagerNo" />
- <result property="managername" column="ManagerName" />
- <result property="deptmentno" column="DeptmentNo" />
- <result property="deptmentname" column="DeptmentName" />
- <result property="opochecker" column="OPOchecker" />
- <result property="finvicepresident" column="FinVicePresident" />
- <result property="busvicepresident" column="BusVicePresident" />
- <result property="officedirector" column="OfficeDirector" />
- <result property="financedirector" column="FinanceDirector" />
- <result property="financechecher" column="FinanceChecher" />
- <result property="infoid" column="InfoID" />
- <result property="donorno" column="DonorNo" />
- <result property="remark" column="remark" />
- <result property="recordstatus" column="RecordStatus" />
- <result property="uploadflag" column="uploadflag" />
- <result property="uploadtime" column="uploadtime" />
- <result property="travelers" column="Travelers" />
- <result property="reason" column="Reason" />
- <result property="donorname" column="DonorName" />
- <result property="totalamount" column="totalAmount" />
- <result property="bigstrmoney" column="bigStrMoney" />
- <result property="flowlevel" column="FlowLevel" />
- <result property="costtype" column="costtype" />
- <result property="costtypename" column="costtypename" />
- <result property="fileurl" column="fileurl" />
- <result property="donorbank" column="donorbank" />
- <result property="donorbankcard" column="donorbankcard" />
- <result property="donorremark" column="donorremark" />
- <result property="donoramount" column="donoramount" />
- <result property="donorrelatives" column="donorrelatives" />
+
+ <resultMap type="com.ruoyi.project.domain.ServiceReimbursement" id="ServiceReimbursementResult">
+ <result property="id" column="ID"/>
+ <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"/>
+ <result property="userno" column="UserNo"/>
+ <result property="username" column="UserName"/>
+ <result property="idcardtype" column="IDCardType"/>
+ <result property="idcardno" column="IDCardNo"/>
+ <result property="phone" column="Phone"/>
+ <result property="depositbank" column="DepositBank"/>
+ <result property="bankcardno" column="BankCardNo"/>
+ <result property="branchbankname" column="BranchBankName"/>
+ <result property="annexbankcard" column="AnnexBankCard"/>
+ <result property="annexfiles" column="AnnexFiles"/>
+ <result property="amountrequested" column="AmountRequested"/>
+ <result property="prepaidamount" column="PrepaidAmount"/>
+ <result property="invoicecount" column="InvoiceCount"/>
+ <result property="attachcount" column="AttachCount"/>
+ <result property="managerno" column="ManagerNo"/>
+ <result property="managername" column="ManagerName"/>
+ <result property="deptmentno" column="DeptmentNo"/>
+ <result property="deptmentname" column="DeptmentName"/>
+ <result property="opochecker" column="OPOchecker"/>
+ <result property="finvicepresident" column="FinVicePresident"/>
+ <result property="president" column="president"/>
+ <result property="busvicepresident" column="BusVicePresident"/>
+ <result property="officedirector" column="OfficeDirector"/>
+ <result property="financedirector" column="FinanceDirector"/>
+ <result property="financechecher" column="FinanceChecher"/>
+ <result property="infoid" column="InfoID"/>
+ <result property="donorno" column="DonorNo"/>
+ <result property="remark" column="remark"/>
+ <result property="recordstatus" column="RecordStatus"/>
+ <result property="uploadflag" column="uploadflag"/>
+ <result property="uploadtime" column="uploadtime"/>
+ <result property="travelers" column="Travelers"/>
+ <result property="reason" column="Reason"/>
+ <result property="donorname" column="DonorName"/>
+ <result property="totalamount" column="totalAmount"/>
+ <result property="bigstrmoney" column="bigStrMoney"/>
+ <result property="flowlevel" column="FlowLevel"/>
+ <result property="costtype" column="costtype"/>
+ <result property="costtypename" column="costtypename"/>
+ <result property="fileurl" column="fileurl"/>
+ <result property="donorbank" column="donorbank"/>
+ <result property="donorbankcard" column="donorbankcard"/>
+ <result property="donorremark" column="donorremark"/>
+ <result property="donoramount" column="donoramount"/>
+ <result property="donorrelatives" column="donorrelatives"/>
+ <result property="backflowlevel" column="backFlowLevel"/>
+ <result property="zffs" column="zffs"/>
+ <result property="riqi" column="riqi"/>
+ <result property="bh" column="bh"/>
+ <result property="checkstatus" column="checkstatus"/>
+ <result property="performancetype" column="performancetype"/>
+ <result property="applyTime" column="apply_time"/>
+ <result property="uploadStates" column="upload_states"/>
+ <result property="notes" column="notes"/>
</resultMap>
<sql id="selectServiceReimbursementVo">
- select ID, del_flag, create_by, create_time, update_by, update_time, UserNo, UserName, IDCardType, IDCardNo, Phone, DepositBank, BankCardNo, BranchBankName, AnnexBankCard, AnnexFiles, AmountRequested, PrepaidAmount, InvoiceCount, AttachCount, ManagerNo, ManagerName, DeptmentNo, DeptmentName, OPOchecker, FinVicePresident, BusVicePresident, OfficeDirector, FinanceDirector, FinanceChecher, InfoID, DonorNo, remark, RecordStatus, uploadflag, uploadtime, Travelers, DonorName, Reason, FlowLevel, costtype, costtypename,fileurl,donorbank,donorbankcard,donorremark, donoramount,donorrelatives from service_reimbursement
+ select ID,
+ del_flag,
+ create_by,
+ create_time,
+ update_by,
+ update_time,
+ UserNo,
+ UserName,
+ IDCardType,
+ IDCardNo,
+ Phone,
+ DepositBank,
+ BankCardNo,
+ BranchBankName,
+ AnnexBankCard,
+ AnnexFiles,
+ AmountRequested,
+ PrepaidAmount,
+ InvoiceCount,
+ AttachCount,
+ ManagerNo,
+ ManagerName,
+ DeptmentNo,
+ DeptmentName,
+ OPOchecker,
+ FinVicePresident,
+ president,
+ BusVicePresident,
+ OfficeDirector,
+ FinanceDirector,
+ FinanceChecher,
+ InfoID,
+ DonorNo,
+ remark,
+ RecordStatus,
+ uploadflag,
+ uploadtime,
+ Travelers,
+ DonorName,
+ Reason,
+ FlowLevel,
+ costtype,
+ costtypename,
+ fileurl,
+ donorbank,
+ donorbankcard,
+ donorremark,
+ donoramount,
+ donorrelatives,
+ backFlowLevel,
+ zffs,
+ riqi,
+ bh,
+ checkstatus,
+ apply_time,
+ performancetype,
+ upload_states,
+ notes
+ from service_reimbursement
</sql>
- <select id="selectServiceReimbursementList" parameterType="ServiceReimbursement" resultMap="ServiceReimbursementResult">
+ <select id="selectServiceReimbursementList" parameterType="com.ruoyi.project.domain.ServiceReimbursement"
+ resultMap="ServiceReimbursementResult">
<include refid="selectServiceReimbursementVo"/>
<where>
- <if test="createBy != null and createBy != ''"> and create_by = #{createBy}</if>
- <if test="createTime != null "> and create_time = #{createTime}</if>
- <if test="username != null and username != ''"> and UserName like concat('%', #{username}, '%')</if>
- <if test="deptmentname != null and deptmentname != ''"> and DeptmentName like concat('%', #{deptmentname}, '%')</if>
- <if test="donorno != null and donorno != ''"> and DonorNo = #{donorno}</if>
- <if test="recordstatus != null and recordstatus != ''"> and RecordStatus = #{recordstatus}</if>
- <if test="uploadflag != null and uploadflag != ''"> and uploadflag = #{uploadflag}</if>
- <if test="travelers != null and travelers != ''"> and Travelers = #{travelers}</if>
+ <if test="createBy != null and createBy != ''">and create_by = #{createBy}</if>
+ <if test="createTime != null ">and create_time = #{createTime}</if>
+ <if test="username != null and username != ''">and UserName like concat('%', #{username}, '%')</if>
+ <if test="deptmentname != null and deptmentname != ''">and DeptmentName like concat('%', #{deptmentname},
+ '%')
+ </if>
+ <if test="donorno != null and donorno != ''">and DonorNo = #{donorno}</if>
+ <if test="recordstatus != null and recordstatus != ''">and RecordStatus = #{recordstatus}</if>
+ <if test="uploadflag != null and uploadflag != ''">and uploadflag = #{uploadflag}</if>
+ <if test="travelers != null and travelers != ''">and Travelers = #{travelers}</if>
</where>
</select>
<select id="getMaxId" resultType="java.lang.Long">
- select max(ID) from service_reimbursement
+ select max(ID)
+ from service_reimbursement
</select>
<select id="selectSearchList" resultMap="ServiceReimbursementResult">
<include refid="selectServiceReimbursementVo"/>
<where>
- <if test="createTime != null and createTime != ''" > and create_time >= #{searchstarttime} and create_time <= #{searchendtime} </if>
- <if test="travelers != null and travelers != ''"> and Travelers = #{travelers}</if>
+ <if test="createTime != null and createTime != ''">and create_time >= #{searchstarttime} and create_time
+ <= #{searchendtime}
+ </if>
+ <if test="travelers != null and travelers != ''">and Travelers = #{travelers}</if>
</where>
</select>
- <select id="getListBypower" statementType="CALLABLE" resultType="com.ruoyi.project.domain.vo.SpFinancialExpensesReimbursementOut">
- call SP_FINANCIAL_EXPENSES(#{PAUSERNO,mode=IN,jdbcType=VARCHAR},#{PAFUNDTYPE,mode=IN,jdbcType=INTEGER},#{PAAPPLICANT,mode=IN,jdbcType=VARCHAR},#{PAAPPLICATIONBEGTIME,mode=IN,jdbcType=VARCHAR},#{PAAPPLICATIONENDTIME,mode=IN,jdbcType=VARCHAR},#{PADEPARTMENT,mode=IN,jdbcType=VARCHAR},#{CHECKFLAG,mode=IN,jdbcType=INTEGER},#{APPLYTYPE,mode=IN,jdbcType=INTEGER})
+ <select id="getListBypower" statementType="CALLABLE"
+ resultType="com.ruoyi.project.domain.vo.SpFinancialExpensesReimbursementOut">
+ call SP_FINANCIAL_EXPENSES(#{PAUSERNO,mode=IN,jdbcType=VARCHAR},#{PAFUNDTYPE,mode=IN,jdbcType=INTEGER},#{PAAPPLICANT,mode=IN,jdbcType=VARCHAR},#{PAAPPLICATIONBEGTIME,mode=IN,jdbcType=VARCHAR},#{PAAPPLICATIONENDTIME,mode=IN,jdbcType=VARCHAR},#{PADEPARTMENT,mode=IN,jdbcType=VARCHAR},#{CHECKFLAG,mode=IN,jdbcType=INTEGER},#{APPLYTYPE,mode=IN,jdbcType=INTEGER},#{CHECKSTATUS,mode=IN,jdbcType=INTEGER},#{donorname,mode=IN,jdbcType=VARCHAR})
</select>
<select id="getInfoByInfoId" resultType="com.ruoyi.project.domain.ServiceReimbursement">
<include refid="selectServiceReimbursementVo"/>
@@ -100,4 +175,34 @@
where infoid = #{infoid} and del_flag = '0' and costtype = "4"
</select>
+ <select id="getRDInfoByItem" resultType="com.ruoyi.project.domain.ServiceReimbursementEo">
+ SELECT a.id as id,a.UserNo as userno,a.FlowLevel as recordstatus,b.persontype as persontype,a.create_time as
+ createTime,a.managername as managername,a.bh as bh,a.OPOchecker as opochecker,a.FinVicePresident as finvicepresident,a.BusVicePresident as busvicepresident,a.OfficeDirector as officedirector,a.FinanceDirector as financedirector,a.FinanceChecher as financechecher,
+ a.UserName as username,b.personname as travelers,a.AmountRequested as amountrequested,a.Reason as reason,a.Phone
+ as phone,a.DepositBank as depositbank,a.BankCardNo as bankcardno,a.DonorName as donorname,a.DeptmentName as deptmentname,b.trafficexpense as
+ trafficexpense,b.hotelexpense as hotelexpense,b.FoodExpenses as foodexpenses, b.foodallowance as foodallowance,
+ b.otherexpense as otherexpense,b.otherfeeamount as otherfeeamount,b.CityFee as cityfee FROM service_reimbursement a LEFT JOIN
+ service_reimbursementdetail b on a.id=b.RBID where a.del_flag != 1 and b.del_flag!=1
+ <if test="id != null">
+ and a.id = #{id}
+ </if>
+ <if test='travelers != null and travelers != ""'>
+ and b.personname=#{travelers}
+ </if>
+ <if test='username != null and username != ""'>
+ and a.UserName=#{username}
+ </if>
+ <if test='recordstatus != null and recordstatus != ""'>
+ and a.FlowLevel=#{recordstatus}
+ </if>
+ <if test='travelers != null and travelers != ""'>
+ and b.personname=#{travelers}
+ </if>
+ <if test='starttime != null and endtime != ""'>
+ and a.create_time BETWEEN #{starttime} AND #{endtime}
+ </if>
+
+ ORDER BY a.id desc
+ </select>
+
</mapper>
\ No newline at end of file
--
Gitblit v1.9.3