From 9c8c30d9ead02243a0cc3807fe6d47df9a6b51af Mon Sep 17 00:00:00 2001
From: yxh <172933527@qq.com>
Date: 星期二, 03 六月 2025 15:33:09 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-project/src/main/resources/mapper/project/ServiceReimbursementMapper.xml | 8 ++++++--
1 files changed, 6 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 466fb65..c346b7e 100644
--- a/ruoyi-project/src/main/resources/mapper/project/ServiceReimbursementMapper.xml
+++ b/ruoyi-project/src/main/resources/mapper/project/ServiceReimbursementMapper.xml
@@ -63,6 +63,8 @@
<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">
@@ -121,7 +123,9 @@
bh,
checkstatus,
apply_time,
- performancetype
+ performancetype,
+ upload_states,
+ notes
from service_reimbursement
</sql>
@@ -172,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