From 6892c31200a7ed1b0e60ee5aff794b1fcecc7ef6 Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期三, 01 十一月 2023 16:28:06 +0800
Subject: [PATCH] 解决文件上传时，文件名重复问题
---
ruoyi-project/src/main/resources/mapper/project/ServiceFunddetailMapper.xml | 143 ++++++++++++++++++++++++++++++-----------------
1 files changed, 90 insertions(+), 53 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..31e3320 100644
--- a/ruoyi-project/src/main/resources/mapper/project/ServiceFunddetailMapper.xml
+++ b/ruoyi-project/src/main/resources/mapper/project/ServiceFunddetailMapper.xml
@@ -5,55 +5,63 @@
<mapper namespace="com.ruoyi.project.mapper.ServiceFunddetailMapper">
<resultMap type="com.ruoyi.project.domain.ServiceFunddetail" id="ServiceFunddetailResult">
- <result property="id" column="ID"/>
- <result property="fundid" column="fundID"/>
- <result property="beneficiaryname" column="BeneficiaryName"/>
- <result property="beneficiaryno" column="BeneficiaryNo"/>
- <result property="unitname" column="UnitName"/>
- <result property="unitno" column="UnitNo"/>
- <result property="unituserno" column="UnitUserNo"/>
- <result property="title" column="Title"/>
- <result property="idcardtype" column="IDCardType"/>
- <result property="idcardno" column="IDCardNo"/>
- <result property="sex" column="Sex"/>
- <result property="familyrelations" column="FamilyRelations"/>
- <result property="phone" column="Phone"/>
- <result property="depositbank" column="DepositBank"/>
- <result property="bankcardno" column="BankCardNo"/>
- <result property="branchbankname" column="BranchBankName"/>
- <result property="annexbankcard" column="AnnexBankCard"/>
- <result property="annexregistform" column="AnnexRegistForm"/>
- <result property="applytype" column="ApplyType"/>
- <result property="applytypename" column="ApplyTypeName"/>
- <result property="itemid" column="ItemID"/>
- <result property="itemname" column="ItemName"/>
- <result property="itemtype" column="ItemType"/>
- <result property="amount" column="Amount"/>
- <result property="prepaidamount" column="PrepaidAmount"/>
- <result property="taxamount" column="TaxAmount"/>
- <result property="invoicecount" column="InvoiceCount"/>
- <result property="taxedamount" column="TaxedAmount"/>
- <result property="attachcount" column="AttachCount"/>
- <result property="remark" column="Remark"/>
- <result property="recordstatus" column="RecordStatus"/>
- <result property="price" column="Price"/>
- <result property="quantity" column="Quantity"/>
- <result property="del_flag" column="del_flag"/>
- <result property="createBy" column="create_by"/>
- <result property="createTime" column="create_time"/>
- <result property="updateBy" column="update_by"/>
- <result property="updateTime" column="update_time"/>
- <result property="uploadflag" column="uploadflag"/>
- <result property="uploadtime" column="uploadtime"/>
- <result property="infoid" column="InfoId"/>
- <result property="donorno" column="DonorNo"/>
- <result property="donorname" column="DonorName"/>
- <result property="servicesscope" column="SERVICESSCOPE"/>
- <result property="servicesscopename" column="SERVICESSCOPENAME"/>
- <result property="servicetype" column="SERVICETYPE"/>
- <result property="servicetypename" column="SERVICETYPENAME"/>
- <result property="orderno" column="OrderNo"/>
- <result property="itemcode" column="ItemCode"/>
+ <result property="id" column="ID" />
+ <result property="fundid" column="fundID" />
+ <result property="orderno" column="OrderNo" />
+ <result property="itemid" column="ItemID" />
+ <result property="itemcode" column="ItemCode" />
+ <result property="itemname" column="ItemName" />
+ <result property="itemdescribe" column="ItemDescribe" />
+ <result property="itemtype" column="ItemType" />
+ <result property="applytype" column="ApplyType" />
+ <result property="applytypename" column="ApplyTypeName" />
+ <result property="beneficiaryname" column="BeneficiaryName" />
+ <result property="beneficiaryno" column="BeneficiaryNo" />
+ <result property="unitname" column="UnitName" />
+ <result property="unitno" column="UnitNo" />
+ <result property="unituserno" column="UnitUserNo" />
+ <result property="title" column="Title" />
+ <result property="idcardtype" column="IDCardType" />
+ <result property="idcardno" column="IDCardNo" />
+ <result property="sex" column="Sex" />
+ <result property="familyrelations" column="FamilyRelations" />
+ <result property="phone" column="Phone" />
+ <result property="depositbank" column="DepositBank" />
+ <result property="bankcardno" column="BankCardNo" />
+ <result property="branchbankname" column="BranchBankName" />
+ <result property="annexbankcard" column="AnnexBankCard" />
+ <result property="annexregistform" column="AnnexRegistForm" />
+ <result property="quantity" column="Quantity" />
+ <result property="price" column="Price" />
+ <result property="amount" column="Amount" />
+ <result property="taxamount" column="TaxAmount" />
+ <result property="taxedamount" column="TaxedAmount" />
+ <result property="prepaidamount" column="PrepaidAmount" />
+ <result property="invoicecount" column="InvoiceCount" />
+ <result property="attachcount" column="AttachCount" />
+ <result property="remark" column="Remark" />
+ <result property="infoid" column="InfoId" />
+ <result property="donorno" column="DonorNo" />
+ <result property="donorname" column="DonorName" />
+ <result property="recordstatus" column="RecordStatus" />
+ <result property="del_flag" column="del_flag" />
+ <result property="createBy" column="create_by" />
+ <result property="createTime" column="create_time" />
+ <result property="updateBy" column="update_by" />
+ <result property="updateTime" column="update_time" />
+ <result property="uploadflag" column="uploadflag" />
+ <result property="uploadtime" column="uploadtime" />
+ <result property="servicesscope" column="SERVICESSCOPE" />
+ <result property="servicesscopename" column="SERVICESSCOPENAME" />
+ <result property="servicetype" column="SERVICETYPE" />
+ <result property="servicetypename" column="SERVICETYPENAME" />
+ <result property="reimbursementamount" column="REIMBURSEMENTAMOUNT" />
+ <result property="subjecttype" column="subjecttype" />
+ <result property="subjecttypename" column="subjecttypename" />
+ <result property="annexfiles" column="AnnexFiles" />
+ <result property="taxTime" column="tax_time" />
+ <result property="jxrq" column="jxrq" />
+ <result property="invoicefiles" column="InvoiceFiles" />
</resultMap>
<sql id="selectServiceFunddetailVo">
@@ -105,7 +113,14 @@
SERVICESSCOPE,
SERVICESSCOPENAME,
SERVICETYPE,
- SERVICETYPENAME
+ SERVICETYPENAME,
+ subjecttype,
+ subjecttypename,
+ AnnexFiles,
+ InvoiceFiles,
+ tax_time,
+ jxrq,
+ ItemDescribe
from service_funddetail
</sql>
@@ -218,12 +233,14 @@
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'
and a.fundID = b.id
- <if test="beneficiaryNo != null and beneficiaryNo != '' ">and a.beneficiaryNo = #{beneficiaryNo}</if>
+ <if test="idcardno != null and idcardno != '' ">and a.IDCardNo = #{idcardno}</if>
and b.create_time >= #{starttime}
and b.create_time <= #{endtime}
@@ -232,7 +249,27 @@
<select id="getTaxBeforeByBeneFiciaryNo" parameterType="com.ruoyi.project.domain.vo.TaxMoneyVO"
resultMap="ServiceFunddetailResult">
<include refid="selectServiceFunddetailVo"/>
- where create_time like concat(#{startTime}, '%') and beneficiaryNo=#{beneficiaryNo}
+ where create_time like concat(#{startTime}, '%') and IDCardNo=#{idcardno}
</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 < #{fundID}
+ and tax_time < #{taxTime}
+ and tax_time >= #{firstDay}
+ and IDCardNo = #{IDCard}
+ and ApplyType in (1, 2)
+ </select>
+
</mapper>
\ No newline at end of file
--
Gitblit v1.9.3