From 2b919980a8c70554a64cb3d03cc95679af4d817f Mon Sep 17 00:00:00 2001
From: Your Name <you@example.com>
Date: 星期一, 03 七月 2023 00:22:16 +0800
Subject: [PATCH] Merge branch 'master' of http://git.homecommunity.cn/supervip/MicroCommunity
---
java110-db/src/main/resources/mapper/fee/FeeReceiptServiceDaoImplMapper.xml | 9 ++++++++-
1 files changed, 8 insertions(+), 1 deletions(-)
diff --git a/java110-db/src/main/resources/mapper/fee/FeeReceiptServiceDaoImplMapper.xml b/java110-db/src/main/resources/mapper/fee/FeeReceiptServiceDaoImplMapper.xml
index 927667b..241d2b6 100755
--- a/java110-db/src/main/resources/mapper/fee/FeeReceiptServiceDaoImplMapper.xml
+++ b/java110-db/src/main/resources/mapper/fee/FeeReceiptServiceDaoImplMapper.xml
@@ -36,7 +36,8 @@
<select id="getFeeReceiptInfo" parameterType="Map" resultType="Map">
select t.amount,t.obj_id,t.obj_id objId,t.remark,t.status_cd,t.status_cd statusCd,t.obj_name,t.obj_name
objName,t.community_id,t.community_id communityId,t.receipt_id,t.receipt_id receiptId,t.obj_type,t.obj_type
- objType,t.create_time createTime,frd.fee_name feeName,t.pay_obj_id payObjId,t.pay_obj_name payObjName,pf.fee_type_cd feeTypeCd
+ objType,t.create_time createTime,frd.fee_name feeName,t.pay_obj_id payObjId,t.pay_obj_name payObjName,pf.fee_type_cd feeTypeCd,
+ frd.start_time startTime,frd.end_time endTime,pf.fee_flag feeFlag
from fee_receipt t
inner join fee_receipt_detail frd on t.receipt_id = frd.receipt_id and frd.status_cd = '0'
inner join pay_fee pf on frd.fee_id = pf.fee_id and pf.status_cd = '0'
@@ -79,6 +80,9 @@
<foreach collection="detailIds" item="item" open="(" close=")" separator=",">
#{item}
</foreach>
+ </if>
+ <if test="feeId !=null and feeId != ''">
+ and frd.fee_id = #{feeId}
</if>
<if test="objType !=null and objType != ''">
and t.obj_type= #{objType}
@@ -334,6 +338,9 @@
#{item}
</foreach>
</if>
+ <if test="feeId !=null and feeId != ''">
+ and frd.fee_id = #{feeId}
+ </if>
<if test="objType !=null and objType != ''">
and t.obj_type= #{objType}
</if>
--
Gitblit v1.8.0