From c20c99f256e2f47bd45f0b48fb6b1bcc83960f1e Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期四, 21 三月 2024 14:22:13 +0800
Subject: [PATCH] 代码提交
---
ruoyi-project/src/main/resources/mapper/project/ServiceReimbursementMapper.xml | 24 +++++++++++++++++++-----
1 files changed, 19 insertions(+), 5 deletions(-)
diff --git a/ruoyi-project/src/main/resources/mapper/project/ServiceReimbursementMapper.xml b/ruoyi-project/src/main/resources/mapper/project/ServiceReimbursementMapper.xml
index 519981a..cf33948 100644
--- a/ruoyi-project/src/main/resources/mapper/project/ServiceReimbursementMapper.xml
+++ b/ruoyi-project/src/main/resources/mapper/project/ServiceReimbursementMapper.xml
@@ -31,6 +31,7 @@
<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"/>
@@ -58,6 +59,12 @@
<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">
@@ -87,6 +94,7 @@
DeptmentName,
OPOchecker,
FinVicePresident,
+ president,
BusVicePresident,
OfficeDirector,
FinanceDirector,
@@ -111,7 +119,13 @@
donorrelatives,
backFlowLevel,
zffs,
- riqi
+ riqi,
+ bh,
+ checkstatus,
+ apply_time,
+ performancetype,
+ upload_states,
+ notes
from service_reimbursement
</sql>
@@ -150,7 +164,7 @@
<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})
+ 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"/>
@@ -163,11 +177,11 @@
<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,
+ 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,b.trafficexpense as
+ 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 FROM service_reimbursement a LEFT JOIN
+ 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}
--
Gitblit v1.9.3