From 2c07f3c1cf4092fd42e3022c56d1bcf8fcc9438e Mon Sep 17 00:00:00 2001 From: liusheng <337615773@qq.com> Date: 星期二, 15 八月 2023 15:32:14 +0800 Subject: [PATCH] 代码提交 --- ruoyi-project/src/main/resources/mapper/project/ServiceReimbursementMapper.xml | 16 ++++++++++++---- 1 files changed, 12 insertions(+), 4 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..21aa1f1 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,9 @@ <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"/> </resultMap> <sql id="selectServiceReimbursementVo"> @@ -84,6 +88,7 @@ DeptmentName, OPOchecker, FinVicePresident, + president, BusVicePresident, OfficeDirector, FinanceDirector, @@ -105,11 +110,14 @@ donorbankcard, donorremark, donoramount, - donorrelatives + donorrelatives, + backFlowLevel, + zffs, + riqi 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,7 +165,7 @@ <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.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, -- Gitblit v1.9.3