From 64bce2eb858b95e7851b6c05fa34938dbfb701e6 Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期四, 30 五月 2024 16:49:13 +0800
Subject: [PATCH] 修改因算税时间一税，导致获取历史数据不准的问题（加上xh字段） 个税汇总里的功能，删除时一个fund时，将相应的fund的“算税时间” 和"funddetail"表里的“算税时间”、“序号”置空
---
ruoyi-project/src/main/resources/mapper/project/ServiceFunddetailSharedMapper.xml | 288 +++++++++++++++++++++++++++++++++++---------------------
1 files changed, 179 insertions(+), 109 deletions(-)
diff --git a/ruoyi-project/src/main/resources/mapper/project/ServiceFunddetailSharedMapper.xml b/ruoyi-project/src/main/resources/mapper/project/ServiceFunddetailSharedMapper.xml
index b2019d2..390da09 100644
--- a/ruoyi-project/src/main/resources/mapper/project/ServiceFunddetailSharedMapper.xml
+++ b/ruoyi-project/src/main/resources/mapper/project/ServiceFunddetailSharedMapper.xml
@@ -1,123 +1,193 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE mapper
-PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
-"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+ "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.ruoyi.project.mapper.ServiceFunddetailSharedMapper">
-
+
<resultMap type="com.ruoyi.project.domain.ServiceFunddetailShared" id="ServiceFunddetailSharedResult">
- <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="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="paidamount" column="paidAmount" />
- <result property="paidtime" column="paidTime" />
- <result property="payterm" column="payTerm" />
- <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="jine" column="jine" />
- <result property="liyou" column="liyou" />
+ <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="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="annexfiles" column="AnnexFiles"/>
+ <result property="invoicefiles" column="InvoiceFiles"/>
+ <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="paidamount" column="paidAmount"/>
+ <result property="paidtime" column="paidTime"/>
+ <result property="payterm" column="payTerm"/>
+ <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="jine" column="jine"/>
+ <result property="liyou" column="liyou"/>
+ <result property="itemdescribe" column="ItemDescribe"/>
</resultMap>
<sql id="selectServiceFunddetailSharedVo">
- select ID, fundID, OrderNo, ItemID, ItemCode, ItemName, ItemType, ApplyType, ApplyTypeName, BeneficiaryName, BeneficiaryNo, UnitName, UnitNo, UnitUserNo, Title, IDCardType, IDCardNo, Sex, FamilyRelations, Phone, DepositBank, BankCardNo, BranchBankName, AnnexBankCard, AnnexRegistForm, Quantity, Price, Amount, TaxAmount, TaxedAmount, PrepaidAmount, paidAmount, paidTime, payTerm, InvoiceCount, AttachCount, Remark, InfoId, DonorNo, DonorName, RecordStatus, del_flag, create_by, create_time, update_by, update_time, uploadflag, uploadtime, SERVICESSCOPE, SERVICESSCOPENAME, SERVICETYPE, SERVICETYPENAME, REIMBURSEMENTAMOUNT, jine, liyou from service_funddetail_shared
+ select ID,
+ fundID,
+ OrderNo,
+ ItemID,
+ ItemCode,
+ ItemName,
+ ItemType,
+ ApplyType,
+ ApplyTypeName,
+ BeneficiaryName,
+ BeneficiaryNo,
+ UnitName,
+ UnitNo,
+ UnitUserNo,
+ Title,
+ IDCardType,
+ IDCardNo,
+ Sex,
+ FamilyRelations,
+ Phone,
+ DepositBank,
+ BankCardNo,
+ BranchBankName,
+ AnnexBankCard,
+ AnnexRegistForm,
+ Quantity,
+ Price,
+ Amount,
+ TaxAmount,
+ TaxedAmount,
+ PrepaidAmount,
+ paidAmount,
+ paidTime,
+ payTerm,
+ InvoiceCount,
+ AttachCount,
+ Remark,
+ InfoId,
+ DonorNo,
+ DonorName,
+ RecordStatus,
+ del_flag,
+ create_by,
+ create_time,
+ update_by,
+ update_time,
+ uploadflag,
+ uploadtime,
+ SERVICESSCOPE,
+ SERVICESSCOPENAME,
+ SERVICETYPE,
+ SERVICETYPENAME,
+ REIMBURSEMENTAMOUNT,
+ jine,
+ liyou,
+ ItemDescribe
+ from service_funddetail_shared
</sql>
- <select id="selectServiceFunddetailSharedList" parameterType="com.ruoyi.project.domain.ServiceFunddetailShared" resultMap="ServiceFunddetailSharedResult">
+ <select id="selectServiceFunddetailSharedList" parameterType="com.ruoyi.project.domain.ServiceFunddetailShared"
+ resultMap="ServiceFunddetailSharedResult">
<include refid="selectServiceFunddetailSharedVo"/>
<where>
- <if test="fundid != null "> and fundID = #{fundid}</if>
- <if test="orderno != null "> and OrderNo = #{orderno}</if>
- <if test="itemid != null "> and ItemID = #{itemid}</if>
- <if test="itemcode != null and itemcode != ''"> and ItemCode = #{itemcode}</if>
- <if test="itemname != null and itemname != ''"> and ItemName like concat('%', #{itemname}, '%')</if>
- <if test="itemtype != null and itemtype != ''"> and ItemType = #{itemtype}</if>
- <if test="applytype != null and applytype != ''"> and ApplyType = #{applytype}</if>
- <if test="applytypename != null and applytypename != ''"> and ApplyTypeName like concat('%', #{applytypename}, '%')</if>
- <if test="beneficiaryname != null and beneficiaryname != ''"> and BeneficiaryName like concat('%', #{beneficiaryname}, '%')</if>
- <if test="beneficiaryno != null and beneficiaryno != ''"> and BeneficiaryNo = #{beneficiaryno}</if>
- <if test="unitname != null and unitname != ''"> and UnitName like concat('%', #{unitname}, '%')</if>
- <if test="unitno != null and unitno != ''"> and UnitNo = #{unitno}</if>
- <if test="unituserno != null and unituserno != ''"> and UnitUserNo = #{unituserno}</if>
- <if test="title != null and title != ''"> and Title = #{title}</if>
- <if test="idcardtype != null "> and IDCardType = #{idcardtype}</if>
- <if test="idcardno != null and idcardno != ''"> and IDCardNo = #{idcardno}</if>
- <if test="sex != null and sex != ''"> and Sex = #{sex}</if>
- <if test="familyrelations != null and familyrelations != ''"> and FamilyRelations = #{familyrelations}</if>
- <if test="phone != null and phone != ''"> and Phone = #{phone}</if>
- <if test="depositbank != null and depositbank != ''"> and DepositBank = #{depositbank}</if>
- <if test="bankcardno != null and bankcardno != ''"> and BankCardNo = #{bankcardno}</if>
- <if test="branchbankname != null and branchbankname != ''"> and BranchBankName like concat('%', #{branchbankname}, '%')</if>
- <if test="annexbankcard != null and annexbankcard != ''"> and AnnexBankCard = #{annexbankcard}</if>
- <if test="annexregistform != null and annexregistform != ''"> and AnnexRegistForm = #{annexregistform}</if>
- <if test="quantity != null "> and Quantity = #{quantity}</if>
- <if test="price != null "> and Price = #{price}</if>
- <if test="amount != null "> and Amount = #{amount}</if>
- <if test="taxamount != null "> and TaxAmount = #{taxamount}</if>
- <if test="taxedamount != null "> and TaxedAmount = #{taxedamount}</if>
- <if test="prepaidamount != null "> and PrepaidAmount = #{prepaidamount}</if>
- <if test="paidamount != null "> and paidAmount = #{paidamount}</if>
- <if test="paidtime != null "> and paidTime = #{paidtime}</if>
- <if test="payterm != null and payterm != ''"> and payTerm = #{payterm}</if>
- <if test="invoicecount != null "> and InvoiceCount = #{invoicecount}</if>
- <if test="attachcount != null "> and AttachCount = #{attachcount}</if>
- <if test="remark != null and remark != ''"> and Remark = #{remark}</if>
- <if test="infoid != null "> and InfoId = #{infoid}</if>
- <if test="donorno != null and donorno != ''"> and DonorNo = #{donorno}</if>
- <if test="donorname != null and donorname != ''"> and DonorName like concat('%', #{donorname}, '%')</if>
- <if test="recordstatus != null and recordstatus != ''"> and RecordStatus = #{recordstatus}</if>
- <if test="uploadflag != null and uploadflag != ''"> and uploadflag = #{uploadflag}</if>
- <if test="uploadtime != null "> and uploadtime = #{uploadtime}</if>
- <if test="servicesscope != null and servicesscope != ''"> and SERVICESSCOPE = #{servicesscope}</if>
- <if test="servicesscopename != null and servicesscopename != ''"> and SERVICESSCOPENAME like concat('%', #{servicesscopename}, '%')</if>
- <if test="servicetype != null and servicetype != ''"> and SERVICETYPE = #{servicetype}</if>
- <if test="servicetypename != null and servicetypename != ''"> and SERVICETYPENAME like concat('%', #{servicetypename}, '%')</if>
- <if test="reimbursementamount != null "> and REIMBURSEMENTAMOUNT = #{reimbursementamount}</if>
- <if test="jine != null and jine != ''"> and jine = #{jine}</if>
- <if test="liyou != null and liyou != ''"> and liyou = #{liyou}</if>
+ <if test="fundid != null ">and fundID = #{fundid}</if>
+ <if test="orderno != null ">and OrderNo = #{orderno}</if>
+ <if test="itemid != null ">and ItemID = #{itemid}</if>
+ <if test="itemcode != null and itemcode != ''">and ItemCode = #{itemcode}</if>
+ <if test="itemname != null and itemname != ''">and ItemName like concat('%', #{itemname}, '%')</if>
+ <if test="itemtype != null and itemtype != ''">and ItemType = #{itemtype}</if>
+ <if test="applytype != null and applytype != ''">and ApplyType = #{applytype}</if>
+ <if test="applytypename != null and applytypename != ''">and ApplyTypeName like concat('%',
+ #{applytypename}, '%')
+ </if>
+ <if test="beneficiaryname != null and beneficiaryname != ''">and BeneficiaryName like concat('%',
+ #{beneficiaryname}, '%')
+ </if>
+ <if test="beneficiaryno != null and beneficiaryno != ''">and BeneficiaryNo = #{beneficiaryno}</if>
+ <if test="unitname != null and unitname != ''">and UnitName like concat('%', #{unitname}, '%')</if>
+ <if test="unitno != null and unitno != ''">and UnitNo = #{unitno}</if>
+ <if test="unituserno != null and unituserno != ''">and UnitUserNo = #{unituserno}</if>
+ <if test="title != null and title != ''">and Title = #{title}</if>
+ <if test="idcardtype != null ">and IDCardType = #{idcardtype}</if>
+ <if test="idcardno != null and idcardno != ''">and IDCardNo = #{idcardno}</if>
+ <if test="sex != null and sex != ''">and Sex = #{sex}</if>
+ <if test="familyrelations != null and familyrelations != ''">and FamilyRelations = #{familyrelations}</if>
+ <if test="phone != null and phone != ''">and Phone = #{phone}</if>
+ <if test="depositbank != null and depositbank != ''">and DepositBank = #{depositbank}</if>
+ <if test="bankcardno != null and bankcardno != ''">and BankCardNo = #{bankcardno}</if>
+ <if test="branchbankname != null and branchbankname != ''">and BranchBankName like concat('%',
+ #{branchbankname}, '%')
+ </if>
+ <if test="annexbankcard != null and annexbankcard != ''">and AnnexBankCard = #{annexbankcard}</if>
+ <if test="annexregistform != null and annexregistform != ''">and AnnexRegistForm = #{annexregistform}</if>
+ <if test="quantity != null ">and Quantity = #{quantity}</if>
+ <if test="price != null ">and Price = #{price}</if>
+ <if test="amount != null ">and Amount = #{amount}</if>
+ <if test="taxamount != null ">and TaxAmount = #{taxamount}</if>
+ <if test="taxedamount != null ">and TaxedAmount = #{taxedamount}</if>
+ <if test="prepaidamount != null ">and PrepaidAmount = #{prepaidamount}</if>
+ <if test="paidamount != null ">and paidAmount = #{paidamount}</if>
+ <if test="paidtime != null ">and paidTime = #{paidtime}</if>
+ <if test="payterm != null and payterm != ''">and payTerm = #{payterm}</if>
+ <if test="invoicecount != null ">and InvoiceCount = #{invoicecount}</if>
+ <if test="attachcount != null ">and AttachCount = #{attachcount}</if>
+ <if test="remark != null and remark != ''">and Remark = #{remark}</if>
+ <if test="infoid != null ">and InfoId = #{infoid}</if>
+ <if test="donorno != null and donorno != ''">and DonorNo = #{donorno}</if>
+ <if test="donorname != null and donorname != ''">and DonorName like concat('%', #{donorname}, '%')</if>
+ <if test="recordstatus != null and recordstatus != ''">and RecordStatus = #{recordstatus}</if>
+ <if test="uploadflag != null and uploadflag != ''">and uploadflag = #{uploadflag}</if>
+ <if test="uploadtime != null ">and uploadtime = #{uploadtime}</if>
+ <if test="servicesscope != null and servicesscope != ''">and SERVICESSCOPE = #{servicesscope}</if>
+ <if test="servicesscopename != null and servicesscopename != ''">and SERVICESSCOPENAME like concat('%',
+ #{servicesscopename}, '%')
+ </if>
+ <if test="servicetype != null and servicetype != ''">and SERVICETYPE = #{servicetype}</if>
+ <if test="servicetypename != null and servicetypename != ''">and SERVICETYPENAME like concat('%',
+ #{servicetypename}, '%')
+ </if>
+ <if test="reimbursementamount != null ">and REIMBURSEMENTAMOUNT = #{reimbursementamount}</if>
+ <if test="jine != null and jine != ''">and jine = #{jine}</if>
+ <if test="liyou != null and liyou != ''">and liyou = #{liyou}</if>
</where>
</select>
--
Gitblit v1.9.3