From 8c215c8be0f5076e8c95daf1b2203440ca7dfcad Mon Sep 17 00:00:00 2001
From: yxh <172933527@qq.com>
Date: 星期五, 23 十月 2026 13:42:50 +0800
Subject: [PATCH] 修改了报销校验
---
ruoyi-project/src/main/resources/mapper/project/ServiceFundMapper.xml | 6 ++++++
1 files changed, 6 insertions(+), 0 deletions(-)
diff --git a/ruoyi-project/src/main/resources/mapper/project/ServiceFundMapper.xml b/ruoyi-project/src/main/resources/mapper/project/ServiceFundMapper.xml
index fee27fe..14ab295 100644
--- a/ruoyi-project/src/main/resources/mapper/project/ServiceFundMapper.xml
+++ b/ruoyi-project/src/main/resources/mapper/project/ServiceFundMapper.xml
@@ -33,6 +33,7 @@
<result property="deptmentname" column="DeptmentName"/>
<result property="opochecker" column="OPOchecker"/>
<result property="finvicepresident" column="FinVicePresident"/>
+ <result property="financechecher" column="FinanceChecher"/>
<result property="president" column="president"/>
<result property="busvicepresident" column="BusVicePresident"/>
<result property="officedirector" column="OfficeDirector"/>
@@ -66,12 +67,14 @@
<result property="jxrq" column="jxrq"/>
<result property="fundTaxId" column="fund_tax_id"/>
<result property="taxcost" column="TaxCost"/>
+ <result property="summaryId" column="summary_id"/>
</resultMap>
<sql id="selectServiceFundVo">
select ID,
InfoID,
DonorNo,
+ summary_id,
DonorName,
del_flag,
create_by,
@@ -139,6 +142,8 @@
where del_flag = '0'
<if test="donorno != null and donorno != ''">and DonorNo = #{donorno}</if>
+ <!-- 2026-10-22锛氭姤閿�鍗曞垪琛ㄦ敮鎸佹寜"鎹愮尞鑰呭鍚�"妯＄硦绛涢�夛紙浠呭湪浼犲�兼椂鐢熸晥锛屼笉褰卞搷鍏跺畠璋冪敤鏂癸級 -->
+ <if test="donorname != null and donorname != ''">and DonorName like concat('%', #{donorname}, '%')</if>
<if test="fundTaxId != null ">and fund_tax_id = #{fundTaxId}</if>
<if test="userno != null and userno != ''">and UserNo = #{userno}</if>
<if test="username != null and username != ''">and UserName like concat('%', #{username}, '%')</if>
@@ -170,6 +175,7 @@
SELECT
`service_fund`.`ID` AS `id`,
`service_fund`.`InfoID` AS `infoid`,
+ `service_fund`.`summary_id` AS `summaryId`,
`service_fund`.`DonorNo` AS `donorno`,
`service_fund`.`DonorName` AS `donorname`,
`service_fund`.`UserNo` AS `userno`,
--
Gitblit v1.9.3