From bbf8efb4cf186a753128a88822cfd28af46a0f38 Mon Sep 17 00:00:00 2001
From: yxh <172933527@qq.com>
Date: 星期二, 03 六月 2025 14:56:57 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-project/src/main/resources/mapper/project/ServiceReimbursementMapper.xml | 10 ++++++++--
1 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/ruoyi-project/src/main/resources/mapper/project/ServiceReimbursementMapper.xml b/ruoyi-project/src/main/resources/mapper/project/ServiceReimbursementMapper.xml
index be2d22b..c346b7e 100644
--- a/ruoyi-project/src/main/resources/mapper/project/ServiceReimbursementMapper.xml
+++ b/ruoyi-project/src/main/resources/mapper/project/ServiceReimbursementMapper.xml
@@ -62,6 +62,9 @@
<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">
@@ -119,7 +122,10 @@
riqi,
bh,
checkstatus,
- performancetype
+ apply_time,
+ performancetype,
+ upload_states,
+ notes
from service_reimbursement
</sql>
@@ -170,7 +176,7 @@
</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
+ SELECT a.id as id,a.apply_time as applyTime,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
--
Gitblit v1.9.3