From a8e4132c3e2e9c3b3fcb0360901b35571b6464ea Mon Sep 17 00:00:00 2001
From: hsy <1029150275@qq.com>
Date: 星期五, 28 八月 2026 10:13:01 +0800
Subject: [PATCH] feat: 综合业务模块功能补充与实体拓展
---
src/main/resources/mapper/approve/FinReimbursementMapper.xml | 42 +++++++++++++++++++++++++++++++++++++++++-
1 files changed, 41 insertions(+), 1 deletions(-)
diff --git a/src/main/resources/mapper/approve/FinReimbursementMapper.xml b/src/main/resources/mapper/approve/FinReimbursementMapper.xml
index 6b4931c..3b145c0 100644
--- a/src/main/resources/mapper/approve/FinReimbursementMapper.xml
+++ b/src/main/resources/mapper/approve/FinReimbursementMapper.xml
@@ -37,10 +37,12 @@
<select id="listPage" resultType="com.ruoyi.approve.bean.vo.FinReimbursementVo">
select fin_reimbursement.*,
fin_reimbursement_travel.start_time ,
- fin_reimbursement_travel.end_time
+ fin_reimbursement_travel.end_time,
+ sys_dept.dept_name as deptName
from
fin_reimbursement
left join fin_reimbursement_travel on fin_reimbursement.id = fin_reimbursement_travel.reimbursement_id
+ left join sys_dept on fin_reimbursement.dept_id = sys_dept.dept_id
<where>
<if test="ew.billNo != null and ew.billNo != ''">
bill_no like concat('%',#{ew.billNo},'%')
@@ -55,8 +57,46 @@
and create_time >= #{ew.createTimeStart}
and create_time <= #{ew.createTimeEnd}
</if>
+ <if test="ew.deptId != null">
+ and fin_reimbursement.dept_id = #{ew.deptId}
+ </if>
+ <if test="ew.expenseType != null and ew.expenseType != ''">
+ and fin_reimbursement.expense_type = #{ew.expenseType}
+ </if>
</where>
order by create_time desc
</select>
+ <select id="list" resultType="com.ruoyi.approve.bean.vo.FinReimbursementVo">
+ select fin_reimbursement.*,
+ fin_reimbursement_travel.start_time ,
+ fin_reimbursement_travel.end_time,
+ sys_dept.dept_name as deptName
+ from
+ fin_reimbursement
+ left join fin_reimbursement_travel on fin_reimbursement.id = fin_reimbursement_travel.reimbursement_id
+ left join sys_dept on fin_reimbursement.dept_id = sys_dept.dept_id
+ <where>
+ <if test="ew.billNo != null and ew.billNo != ''">
+ bill_no like concat('%',#{ew.billNo},'%')
+ </if>
+ <if test="ew.applicantName != null and ew.applicantName != ''">
+ and applicant_name like concat('%',#{ew.applicantName},'%')
+ </if>
+ <if test="ew.applicantCode != null and ew.applicantCode != ''">
+ and applicant_code like concat('%',#{ew.applicantCode},'%')
+ </if>
+ <if test="ew.createTimeStart != null and ew.createTimeStart !='' and ew.createTimeEnd != null and ew.createTimeEnd != ''">
+ and create_time >= #{ew.createTimeStart}
+ and create_time <= #{ew.createTimeEnd}
+ </if>
+ <if test="ew.deptId != null">
+ and fin_reimbursement.dept_id = #{ew.deptId}
+ </if>
+ <if test="ew.expenseType != null and ew.expenseType != ''">
+ and fin_reimbursement.expense_type = #{ew.expenseType}
+ </if>
+ </where>
+ order by create_time desc
+ </select>
</mapper>
--
Gitblit v1.9.3