From b1f41c066b0b7c38faffddbfe73b9be8d0bd508e Mon Sep 17 00:00:00 2001
From: yxh <172933527@qq.com>
Date: 星期日, 08 十一月 2026 23:42:09 +0800
Subject: [PATCH] 修改了增值税城建税

---
 ruoyi-project/src/main/resources/mapper/project/ServiceFundMapper.xml |   51 +++++++++++++++++++++++++++++++++++++++++++++++++--
 1 files changed, 49 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 fcafa95..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"/>
@@ -63,12 +68,17 @@
         <result property="applyTime" column="apply_time"/>
         <result property="uploadStates" column="upload_states"/>
         <result property="notes" column="notes"/>
+        <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,
@@ -81,6 +91,10 @@
                UnitNo,
                UnitUserNo,
                PretaxCost,
+               vat_cost,
+               city_tax_cost,
+               labor_pretax_cost,
+               tax_version,
                TaxedCost,
                Phone,
                AnnexBankCard,
@@ -123,7 +137,10 @@
                apply_time,
                fundtaxtime,
                upload_states,
-               notes
+               jxrq,
+               notes,
+               TaxCost,
+               fund_tax_id
         from service_fund
     </sql>
 
@@ -133,6 +150,9 @@
 
         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>
         <if test="applytype != null  and applytype != ''">and ApplyType = #{applytype}</if>
@@ -145,6 +165,8 @@
         <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>
+        order by apply_time desc
     </select>
 
     <select id="getInfoByInfoId" resultType="com.ruoyi.project.domain.ServiceFund">
@@ -161,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`,
@@ -203,6 +226,8 @@
         `service_fund`.`uploadtime` AS `uploadtime`,
         `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`,
@@ -257,4 +282,26 @@
             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>
-</mapper>
\ No newline at end of file
+
+    <select id="getExpertfeeList" statementType="CALLABLE"
+            resultType="com.ruoyi.project.domain.vo.SpFinancialExpensesFundOut">
+        call SP_SELECT_EXPERTFEE(#{PAAPPLYTYPE,mode=IN,jdbcType=INTEGER},#{PFUNDTAXID,mode=IN,jdbcType=INTEGER},#{DONORNAME,mode=IN,jdbcType=VARCHAR},#{PADEPARTID,mode=IN,jdbcType=INTEGER},#{PAUSERNAME,mode=IN,jdbcType=VARCHAR})
+    </select>
+
+    <update id="updateFundTaxIdById">
+        update service_fund
+        <set>
+            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>
+</mapper>

--
Gitblit v1.9.3