From 0b04f664887c73e90bf684a4e69c0fdbfe26349d Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期三, 29 三月 2023 13:35:20 +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 f668750..8e7fd12 100755
--- a/java110-db/src/main/resources/mapper/fee/FeeReceiptServiceDaoImplMapper.xml
+++ b/java110-db/src/main/resources/mapper/fee/FeeReceiptServiceDaoImplMapper.xml
@@ -9,8 +9,14 @@
<insert id="saveFeeReceiptInfo" parameterType="Map">
insert into fee_receipt(
amount,obj_id,remark,obj_name,community_id,receipt_id,obj_type,pay_obj_id,pay_obj_name
+ <if test="createTime != null">
+ ,create_time
+ </if>
) values (
#{amount},#{objId},#{remark},#{objName},#{communityId},#{receiptId},#{objType},#{payObjId},#{payObjName}
+ <if test="createTime != null">
+ ,#{createTime}
+ </if>
)
</insert>
@@ -30,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'
--
Gitblit v1.8.0