From e7acba8aaaa91a067728d4769b4af5a9dd6ac189 Mon Sep 17 00:00:00 2001
From: yxh <172933527@qq.com>
Date: 星期三, 31 五月 2023 19:03:59 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-project/src/main/resources/mapper/project/ServiceFunddetailMapper.xml | 253 +++++++++++++++++++++++++++++++++++++-------------
1 files changed, 185 insertions(+), 68 deletions(-)
diff --git a/ruoyi-project/src/main/resources/mapper/project/ServiceFunddetailMapper.xml b/ruoyi-project/src/main/resources/mapper/project/ServiceFunddetailMapper.xml
index 5753b0a..3090737 100644
--- a/ruoyi-project/src/main/resources/mapper/project/ServiceFunddetailMapper.xml
+++ b/ruoyi-project/src/main/resources/mapper/project/ServiceFunddetailMapper.xml
@@ -1,80 +1,132 @@
<?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.ServiceFunddetailMapper">
-
- <resultMap type="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" />
+
+ <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"/>
</resultMap>
<sql id="selectServiceFunddetailVo">
- select ID, fundID, InfoId, DonorNo, DonorName, BeneficiaryName, BeneficiaryNo, UnitName, UnitNo, UnitUserNo, Title, OrderNo, ItemCode, IDCardType, IDCardNo, Sex, FamilyRelations, Phone, DepositBank, BankCardNo, BranchBankName, AnnexBankCard, AnnexRegistForm, ApplyType,ApplyTypeName, ItemID, ItemName, ItemType, Amount, PrepaidAmount, TaxAmount, InvoiceCount, TaxedAmount, AttachCount, Quantity, Price, Remark, RecordStatus, del_flag, create_by, create_time, update_by, update_time, uploadflag, uploadtime,SERVICESSCOPE,SERVICESSCOPENAME,SERVICETYPE,SERVICETYPENAME from service_funddetail
+ select ID,
+ fundID,
+ InfoId,
+ DonorNo,
+ DonorName,
+ BeneficiaryName,
+ BeneficiaryNo,
+ UnitName,
+ UnitNo,
+ UnitUserNo,
+ Title,
+ OrderNo,
+ ItemCode,
+ IDCardType,
+ IDCardNo,
+ Sex,
+ FamilyRelations,
+ Phone,
+ DepositBank,
+ BankCardNo,
+ BranchBankName,
+ AnnexBankCard,
+ AnnexRegistForm,
+ ApplyType,
+ ApplyTypeName,
+ ItemID,
+ ItemName,
+ ItemType,
+ Amount,
+ PrepaidAmount,
+ TaxAmount,
+ InvoiceCount,
+ TaxedAmount,
+ AttachCount,
+ Quantity,
+ Price,
+ Remark,
+ RecordStatus,
+ del_flag,
+ create_by,
+ create_time,
+ update_by,
+ update_time,
+ uploadflag,
+ uploadtime,
+ SERVICESSCOPE,
+ SERVICESSCOPENAME,
+ SERVICETYPE,
+ SERVICETYPENAME
+ from service_funddetail
</sql>
- <select id="selectServiceFunddetailList" parameterType="ServiceFunddetail" resultMap="ServiceFunddetailResult">
+ <select id="selectServiceFunddetailList" parameterType="com.ruoyi.project.domain.ServiceFunddetail"
+ resultMap="ServiceFunddetailResult">
<include refid="selectServiceFunddetailVo"/>
<where>
del_flag = '0'
- <if test="beneficiaryname != null and beneficiaryname != ''"> and BeneficiaryName like concat('%', #{beneficiaryname}, '%')</if>
- <if test="unitname != null and unitname != ''"> and UnitName like concat('%', #{unitname}, '%')</if>
- <if test="applytype != null and applytype != ''"> and ApplyType = #{applytype}</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="recordstatus != null and recordstatus != ''"> and RecordStatus = #{recordstatus}</if>
- <if test="createBy != null and createBy != ''"> and create_by = #{createBy}</if>
- <if test="createTime != null "> and create_time = #{createTime}</if>
- <if test="uploadflag != null and uploadflag != ''"> and uploadflag = #{uploadflag}</if>
- <if test="uploadtime != null "> and uploadtime = #{uploadtime}</if>
- <if test="fundid != null and fundid != '' "> and fundID = #{fundid}</if>
+ <if test="beneficiaryname != null and beneficiaryname != ''">and BeneficiaryName like concat('%',
+ #{beneficiaryname}, '%')
+ </if>
+ <if test="unitname != null and unitname != ''">and UnitName like concat('%', #{unitname}, '%')</if>
+ <if test="applytype != null and applytype != ''">and ApplyType = #{applytype}</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="recordstatus != null and recordstatus != ''">and RecordStatus = #{recordstatus}</if>
+ <if test="createBy != null and createBy != ''">and create_by = #{createBy}</if>
+ <if test="createTime != null ">and create_time = #{createTime}</if>
+ <if test="uploadflag != null and uploadflag != ''">and uploadflag = #{uploadflag}</if>
+ <if test="uploadtime != null ">and uploadtime = #{uploadtime}</if>
+ <if test="fundid != null and fundid != '' ">and fundID = #{fundid}</if>
</where>
</select>
@@ -109,8 +161,73 @@
where fundID = #{id} and ItemType = "12"
</select>
<select id="countItem" resultType="java.lang.Integer">
- select count(*) from service_funddetail
- where ItemID = #{itemid} and fundID = #{fundid} and del_flag = '0'
+ select count(*)
+ from service_funddetail
+ where ItemID = #{itemid}
+ and fundID = #{fundid}
+ and del_flag = '0'
</select>
+ <select id="getDataBybeneficiaryNo" parameterType="com.ruoyi.project.domain.FunddetailReqVo"
+ resultMap="ServiceFunddetailResult">
+ select a.ID,
+ a.fundID,
+ a.InfoId,
+ a.DonorNo,
+ a.DonorName,
+ a.BeneficiaryName,
+ a.BeneficiaryNo,
+ a.UnitName,
+ a.UnitNo,
+ a.UnitUserNo,
+ a.Title,
+ a.OrderNo,
+ a.ItemCode,
+ a.IDCardType,
+ a.IDCardNo,
+ a.Sex,
+ a.FamilyRelations,
+ a.Phone,
+ a.DepositBank,
+ a.BankCardNo,
+ a.BranchBankName,
+ a.AnnexBankCard,
+ a.AnnexRegistForm,
+ a.ApplyType,
+ a.ApplyTypeName,
+ a.ItemID,
+ a.ItemName,
+ a.ItemType,
+ a.Amount,
+ a.PrepaidAmount,
+ a.TaxAmount,
+ a.InvoiceCount,
+ a.TaxedAmount,
+ a.AttachCount,
+ a.Quantity,
+ a.Price,
+ a.Remark,
+ a.RecordStatus,
+ a.del_flag,
+ a.create_by,
+ a.create_time,
+ a.update_by,
+ a.update_time,
+ a.uploadflag,
+ a.uploadtime,
+ a.SERVICESSCOPE,
+ a.SERVICESSCOPENAME,
+ a.SERVICETYPE,
+ a.SERVICETYPENAME
+ 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>
+ and b.create_time >= #{starttime}
+ and b.create_time <= #{endtime}
+
+ </select>
+
+
</mapper>
\ No newline at end of file
--
Gitblit v1.9.3