From 4c42cd3d556ea72d70ea43a734cc38acd6b81e74 Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期五, 15 三月 2024 18:26:43 +0800
Subject: [PATCH] 代码提交

---
 ruoyi-project/src/main/resources/mapper/project/ServiceFundMapper.xml |   11 ++++++++++-
 1 files changed, 10 insertions(+), 1 deletions(-)

diff --git a/ruoyi-project/src/main/resources/mapper/project/ServiceFundMapper.xml b/ruoyi-project/src/main/resources/mapper/project/ServiceFundMapper.xml
index 955a7b7..8ff32ae 100644
--- a/ruoyi-project/src/main/resources/mapper/project/ServiceFundMapper.xml
+++ b/ruoyi-project/src/main/resources/mapper/project/ServiceFundMapper.xml
@@ -64,6 +64,7 @@
         <result property="uploadStates" column="upload_states"/>
         <result property="notes" column="notes"/>
         <result property="jxrq" column="jxrq"/>
+        <result property="fundTaxId" column="fund_tax_id"/>
     </resultMap>
 
     <sql id="selectServiceFundVo">
@@ -125,7 +126,8 @@
                fundtaxtime,
                upload_states,
                jxrq,
-               notes
+               notes,
+               fund_tax_id
         from service_fund
     </sql>
 
@@ -135,6 +137,7 @@
 
         where del_flag = '0'
         <if test="donorno != null  and donorno != ''">and DonorNo = #{donorno}</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>
         <if test="applytype != null  and applytype != ''">and ApplyType = #{applytype}</if>
@@ -207,6 +210,7 @@
         `service_fund`.`PretaxCost` AS `pretaxcost`,
         `service_fund`.`TaxedCost` AS `taxedcost`,
         `service_fund`.`jxrq` AS `jxrq`,
+        `service_fund`.`fund_tax_id` AS `fundTaxId`,
         `service_funddetail`.`ID` AS `fdid`,
         `service_funddetail`.`fundID` AS `fundid`,
         `service_funddetail`.`BeneficiaryName` AS `beneficiaryname`,
@@ -261,4 +265,9 @@
             resultType="com.ruoyi.project.domain.vo.SpFinancialExpensesFundOut">
         call SP_FINANCIAL_EXPENSES(#{PAUSERNO,mode=IN,jdbcType=VARCHAR},#{PAFUNDTYPE,mode=IN,jdbcType=INTEGER},#{PAAPPLICANT,mode=IN,jdbcType=VARCHAR},#{PAAPPLICATIONBEGTIME,mode=IN,jdbcType=VARCHAR},#{PAAPPLICATIONENDTIME,mode=IN,jdbcType=VARCHAR},#{PADEPARTMENT,mode=IN,jdbcType=VARCHAR},#{CHECKFLAG,mode=IN,jdbcType=INTEGER},#{APPLYTYPE,mode=IN,jdbcType=INTEGER},#{CHECKSTATUS,mode=IN,jdbcType=INTEGER},#{donorname,mode=IN,jdbcType=VARCHAR})
     </select>
+
+    <select id="getExpertfeeList" statementType="CALLABLE"
+            resultType="com.ruoyi.project.domain.vo.SpFinancialExpensesFundOut">
+        call SP_SELECT_EXPERTFEE(#{PAAPPLYTYPE,mode=IN,jdbcType=INTEGER},#{DONORNAME,mode=IN,jdbcType=VARCHAR},#{PACHECKNO,mode=IN,jdbcType=VARCHAR},#{CHECKSTATUS,mode=IN,jdbcType=INTEGER},#{PADEPARTNO,mode=IN,jdbcType=VARCHAR},#{PAUSERNAME,mode=IN,jdbcType=VARCHAR})
+    </select>
 </mapper>
\ No newline at end of file

--
Gitblit v1.9.3