From e91d1f0251d30dc3c59b38d5318266357a64c12c Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期三, 20 九月 2023 09:52:40 +0800
Subject: [PATCH] 代码提交

---
 ruoyi-project/src/main/resources/mapper/project/ServiceFunddetailMapper.xml |   33 +++++++++++++++++++++++++++++++--
 1 files changed, 31 insertions(+), 2 deletions(-)

diff --git a/ruoyi-project/src/main/resources/mapper/project/ServiceFunddetailMapper.xml b/ruoyi-project/src/main/resources/mapper/project/ServiceFunddetailMapper.xml
index 94e6adc..1447548 100644
--- a/ruoyi-project/src/main/resources/mapper/project/ServiceFunddetailMapper.xml
+++ b/ruoyi-project/src/main/resources/mapper/project/ServiceFunddetailMapper.xml
@@ -54,6 +54,10 @@
         <result property="servicetypename" column="SERVICETYPENAME"/>
         <result property="orderno" column="OrderNo"/>
         <result property="itemcode" column="ItemCode"/>
+        <result property="subjecttype" column="subjecttype"/>
+        <result property="subjecttypename" column="subjecttypename"/>
+        <result property="annexfiles" column="AnnexFiles"/>
+        <result property="taxTime" column="tax_time"/>
     </resultMap>
 
     <sql id="selectServiceFunddetailVo">
@@ -105,7 +109,11 @@
                SERVICESSCOPE,
                SERVICESSCOPENAME,
                SERVICETYPE,
-               SERVICETYPENAME
+               SERVICETYPENAME,
+               subjecttype,
+               subjecttypename,
+               AnnexFiles,
+               tax_time
         from service_funddetail
     </sql>
 
@@ -218,7 +226,9 @@
         a.SERVICESSCOPE,
         a.SERVICESSCOPENAME,
         a.SERVICETYPE,
-        a.SERVICETYPENAME
+        a.SERVICETYPENAME,
+        a.subjecttype,
+        a.subjecttypename
         from service_funddetail a,
         service_fund b
         where a.del_flag = '0'
@@ -235,4 +245,23 @@
         where create_time like concat(#{startTime}, '%') and beneficiaryNo=#{beneficiaryNo}
 
     </select>
+
+    <update id="updateTaxTime" parameterType="com.ruoyi.project.domain.ServiceFunddetail">
+        update com.ruoyi.project.domain.
+        <set>
+            tax_time = #{taxTime},
+        </set>
+        where fundID = #{fundid}
+    </update>
+
+    <select id="getTaxSum" parameterType="com.ruoyi.project.domain.vo.TaxMoneyByItemEO" resultType="com.ruoyi.project.domain.vo.TaxMoneySumEO">
+        SELECT sum(Amount) amounts, sum(TaxAmount) taxAmounts, sum(TaxedAmount) taxedAmounts
+        FROM service_funddetail
+        where fundID &lt; #{fundID}
+          and tax_time &lt; #{taxTime}
+          and tax_time >= #{firstDay}
+          and ApplyType = #{applyType}
+          and BeneficiaryNo = #{beneficiaryNo}
+    </select>
+
 </mapper>
\ No newline at end of file

--
Gitblit v1.9.3