From b497ff41e47f4ebe69b86f13f6972f34f33f4884 Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期二, 01 六月 2021 09:35:46 +0800
Subject: [PATCH] Merge branch 'master' of http://git.homecommunity.cn/supervip/MicroCommunity
---
java110-db/src/main/resources/mapper/fee/MeterWaterServiceDaoImplMapper.xml | 2 ++
1 files changed, 2 insertions(+), 0 deletions(-)
diff --git a/java110-db/src/main/resources/mapper/fee/MeterWaterServiceDaoImplMapper.xml b/java110-db/src/main/resources/mapper/fee/MeterWaterServiceDaoImplMapper.xml
old mode 100644
new mode 100755
index 2eb81d5..372705b
--- a/java110-db/src/main/resources/mapper/fee/MeterWaterServiceDaoImplMapper.xml
+++ b/java110-db/src/main/resources/mapper/fee/MeterWaterServiceDaoImplMapper.xml
@@ -126,6 +126,7 @@
objId,t.pre_reading_time,t.pre_reading_time preReadingTime,t.b_id,t.b_id bId,t.community_id,t.community_id
communityId,t.obj_type,t.obj_type objType,t.fee_id,t.fee_id feeId,t.obj_name,t.obj_name objName
from meter_water t
+ left join pay_fee pf on t.fee_id = pf.fee_id and pf.status_cd = '0'
where 1 =1
<if test="remark !=null and remark != ''">
and t.remark= #{remark}
@@ -227,6 +228,7 @@
<select id="queryMeterWatersCount" parameterType="Map" resultType="Map">
select count(1) count
from meter_water t
+ inner join pay_fee pf on t.fee_id = pf.fee_id and pf.status_cd = '0'
where 1 =1
<if test="remark !=null and remark != ''">
and t.remark= #{remark}
--
Gitblit v1.8.0