From 08f0193d8bbd4dd9f68706ac1313f564b7219f95 Mon Sep 17 00:00:00 2001 From: liusheng <337615773@qq.com> Date: 星期一, 16 十月 2023 16:05:09 +0800 Subject: [PATCH] 代码提交 --- ruoyi-project/src/main/resources/mapper/project/ServiceFunddetailMapper.xml | 16 ++++++++++++---- 1 files changed, 12 insertions(+), 4 deletions(-) diff --git a/ruoyi-project/src/main/resources/mapper/project/ServiceFunddetailMapper.xml b/ruoyi-project/src/main/resources/mapper/project/ServiceFunddetailMapper.xml index 1447548..f0ec17e 100644 --- a/ruoyi-project/src/main/resources/mapper/project/ServiceFunddetailMapper.xml +++ b/ruoyi-project/src/main/resources/mapper/project/ServiceFunddetailMapper.xml @@ -57,7 +57,11 @@ <result property="subjecttype" column="subjecttype"/> <result property="subjecttypename" column="subjecttypename"/> <result property="annexfiles" column="AnnexFiles"/> + <result property="invoicefiles" column="InvoiceFiles"/> + <result property="taxTime" column="tax_time"/> + <result property="jxrq" column="jxrq"/> + <result property="itemdescribe" column="ItemDescribe"/> </resultMap> <sql id="selectServiceFunddetailVo"> @@ -113,7 +117,10 @@ subjecttype, subjecttypename, AnnexFiles, - tax_time + InvoiceFiles, + tax_time, + jxrq, + ItemDescribe from service_funddetail </sql> @@ -254,14 +261,15 @@ where fundID = #{fundid} </update> - <select id="getTaxSum" parameterType="com.ruoyi.project.domain.vo.TaxMoneyByItemEO" resultType="com.ruoyi.project.domain.vo.TaxMoneySumEO"> + <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 < #{fundID} and tax_time < #{taxTime} and tax_time >= #{firstDay} - and ApplyType = #{applyType} - and BeneficiaryNo = #{beneficiaryNo} + and IDCardNo = #{IDCard} + and ApplyType in (1, 2) </select> </mapper> \ No newline at end of file -- Gitblit v1.9.3