From ee089a8ac4a9d99ef0a0491bbf1d80a2d4fbc393 Mon Sep 17 00:00:00 2001
From: sinake <sinake1@qq.com>
Date: 星期二, 10 十一月 2026 09:15:54 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 ruoyi-project/src/main/resources/mapper/project/ServiceFundMapper.xml |   25 ++++++++++++++++++++++++-
 1 files changed, 24 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 81d136d..c5115cc 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"/>
@@ -50,6 +51,10 @@
         <result property="uploadtime" column="uploadtime"/>
         <result property="flowlevel" column="FlowLevel"/>
         <result property="pretaxcost" column="PretaxCost"/>
+        <result property="vatCost" column="vat_cost"/>
+        <result property="cityTaxCost" column="city_tax_cost"/>
+        <result property="laborPretaxCost" column="labor_pretax_cost"/>
+        <result property="taxVersion" column="tax_version"/>
         <result property="taxedcost" column="TaxedCost"/>
         <result property="backflowlevel" column="backFlowLevel"/>
         <result property="zffs" column="zffs"/>
@@ -66,12 +71,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,
@@ -84,6 +91,10 @@
                UnitNo,
                UnitUserNo,
                PretaxCost,
+               vat_cost,
+               city_tax_cost,
+               labor_pretax_cost,
+               tax_version,
                TaxedCost,
                Phone,
                AnnexBankCard,
@@ -139,6 +150,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 +183,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`,
@@ -277,7 +291,16 @@
     <update id="updateFundTaxIdById">
         update service_fund
         <set>
-            fund_tax_id = #{fundTaxId}
+            fund_tax_id = #{fundTaxId},
+            fundtaxtime = null
+        </set>
+        where id = #{id}
+    </update>
+    <update id="updateFundIsTexById">
+        update service_fund
+        <set>
+            istax = #{isTax},
+            fundtaxtime = null
         </set>
         where id = #{id}
     </update>

--
Gitblit v1.9.3