From 48d56c0780ddcd28a19f306064e1dd21f0c425c0 Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期一, 11 三月 2024 18:23:23 +0800
Subject: [PATCH] 代码提交

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

diff --git a/ruoyi-project/src/main/resources/mapper/project/ServiceFundMapper.xml b/ruoyi-project/src/main/resources/mapper/project/ServiceFundMapper.xml
index 4f24a2c..955a7b7 100644
--- a/ruoyi-project/src/main/resources/mapper/project/ServiceFundMapper.xml
+++ b/ruoyi-project/src/main/resources/mapper/project/ServiceFundMapper.xml
@@ -54,7 +54,16 @@
         <result property="backflowlevel" column="backFlowLevel"/>
         <result property="zffs" column="zffs"/>
         <result property="riqi" column="riqi"/>
-
+        <result property="bh" column="bh"/>
+        <result property="checkstatus" column="checkstatus"/>
+        <result property="performancetype" column="performancetype"/>
+        <result property="istax" column="istax"/>
+        <result property="fundtaxtime" column="fundtaxtime"/>
+        <result property="applyTime" column="apply_time"/>
+        <result property="applyTime" column="apply_time"/>
+        <result property="uploadStates" column="upload_states"/>
+        <result property="notes" column="notes"/>
+        <result property="jxrq" column="jxrq"/>
     </resultMap>
 
     <sql id="selectServiceFundVo">
@@ -107,11 +116,21 @@
                backflowlevel,
                FlowLevel,
                zffs,
-               riqi
+               riqi,
+               bh,
+               checkstatus,
+               performancetype,
+               istax,
+               apply_time,
+               fundtaxtime,
+               upload_states,
+               jxrq,
+               notes
         from service_fund
     </sql>
 
-    <select id="selectServiceFundList" parameterType="ServiceFund" resultMap="ServiceFundResult">
+    <select id="selectServiceFundList" parameterType="com.ruoyi.project.domain.ServiceFund"
+            resultMap="ServiceFundResult">
         <include refid="selectServiceFundVo"/>
 
         where del_flag = '0'
@@ -128,6 +147,7 @@
         <if test="createBy != null  and createBy != '' ">and create_by = #{createBy}</if>
         <if test="infoid != null ">and InfoID = #{infoid}</if>
         <if test="donorno != null   and donorno != '' ">and DonorNo = #{donorno}</if>
+        <if test="jxrq != null ">and jxrq = #{jxrq}</if>
     </select>
 
     <select id="getInfoByInfoId" resultType="com.ruoyi.project.domain.ServiceFund">
@@ -186,6 +206,7 @@
         `service_fund`.`uploadtime` AS `uploadtime`,
         `service_fund`.`PretaxCost` AS `pretaxcost`,
         `service_fund`.`TaxedCost` AS `taxedcost`,
+        `service_fund`.`jxrq` AS `jxrq`,
         `service_funddetail`.`ID` AS `fdid`,
         `service_funddetail`.`fundID` AS `fundid`,
         `service_funddetail`.`BeneficiaryName` AS `beneficiaryname`,
@@ -238,8 +259,6 @@
 
     <select id="getListBypower" statementType="CALLABLE"
             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})
+        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>
-
-
 </mapper>
\ No newline at end of file

--
Gitblit v1.9.3