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/MeterWaterServiceDaoImplMapper.xml | 9 ++++-----
1 files changed, 4 insertions(+), 5 deletions(-)
diff --git a/java110-db/src/main/resources/mapper/fee/MeterWaterServiceDaoImplMapper.xml b/java110-db/src/main/resources/mapper/fee/MeterWaterServiceDaoImplMapper.xml
index b75b879..f22595e 100755
--- a/java110-db/src/main/resources/mapper/fee/MeterWaterServiceDaoImplMapper.xml
+++ b/java110-db/src/main/resources/mapper/fee/MeterWaterServiceDaoImplMapper.xml
@@ -124,8 +124,9 @@
curReadingTime,t.water_id,t.water_id waterId,t.cur_degrees,t.cur_degrees curDegrees,t.create_time,t.create_time
createTime,t.meter_type,t.meter_type meterType,t.pre_degrees,t.pre_degrees preDegrees,t.obj_id,t.obj_id
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,t.price
+ communityId,t.obj_type,t.obj_type objType,t.fee_id,t.fee_id feeId,t.obj_name,t.obj_name objName,t.price,mt.type_name meterTypeName
from meter_water t
+ left join meter_type mt on t.meter_type = mt.type_id and mt.status_cd = '0'
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 != ''">
@@ -228,8 +229,8 @@
<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
+ 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}
</if>
@@ -269,8 +270,6 @@
<if test="feeId !=null and feeId != ''">
and t.fee_id = #{feeId}
</if>
-
-
</select>
--
Gitblit v1.8.0