From 8b8ca4fb9791a5b79107e354cde500ed6f278219 Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期日, 08 十月 2023 18:27:53 +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 49a5689..1874589 100644
--- a/ruoyi-project/src/main/resources/mapper/project/ServiceReimbursementMapper.xml
+++ b/ruoyi-project/src/main/resources/mapper/project/ServiceReimbursementMapper.xml
@@ -4,7 +4,7 @@
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.ruoyi.project.mapper.ServiceReimbursementMapper">
- <resultMap type="ServiceReimbursement" id="ServiceReimbursementResult">
+ <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"/>
@@ -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"/>
@@ -55,6 +56,12 @@
<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"/>
</resultMap>
<sql id="selectServiceReimbursementVo">
@@ -84,6 +91,7 @@
DeptmentName,
OPOchecker,
FinVicePresident,
+ president,
BusVicePresident,
OfficeDirector,
FinanceDirector,
@@ -105,11 +113,17 @@
donorbankcard,
donorremark,
donoramount,
- donorrelatives
+ donorrelatives,
+ backFlowLevel,
+ zffs,
+ riqi,
+ bh,
+ checkstatus,
+ performancetype
from service_reimbursement
</sql>
- <select id="selectServiceReimbursementList" parameterType="ServiceReimbursement"
+ <select id="selectServiceReimbursementList" parameterType="com.ruoyi.project.domain.ServiceReimbursement"
resultMap="ServiceReimbursementResult">
<include refid="selectServiceReimbursementVo"/>
<where>
@@ -157,11 +171,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
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