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 |   13 +++++++++++--
 1 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/ruoyi-project/src/main/resources/mapper/project/ServiceFundMapper.xml b/ruoyi-project/src/main/resources/mapper/project/ServiceFundMapper.xml
index aa38a59..955a7b7 100644
--- a/ruoyi-project/src/main/resources/mapper/project/ServiceFundMapper.xml
+++ b/ruoyi-project/src/main/resources/mapper/project/ServiceFundMapper.xml
@@ -60,7 +60,10 @@
         <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">
@@ -118,7 +121,11 @@
                checkstatus,
                performancetype,
                istax,
-               fundtaxtime
+               apply_time,
+               fundtaxtime,
+               upload_states,
+               jxrq,
+               notes
         from service_fund
     </sql>
 
@@ -140,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">
@@ -198,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`,

--
Gitblit v1.9.3