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 | 25 ++++++++++++-------------
1 files changed, 12 insertions(+), 13 deletions(-)
diff --git a/java110-db/src/main/resources/mapper/fee/MeterWaterServiceDaoImplMapper.xml b/java110-db/src/main/resources/mapper/fee/MeterWaterServiceDaoImplMapper.xml
index 6872585..f22595e 100755
--- a/java110-db/src/main/resources/mapper/fee/MeterWaterServiceDaoImplMapper.xml
+++ b/java110-db/src/main/resources/mapper/fee/MeterWaterServiceDaoImplMapper.xml
@@ -8,10 +8,10 @@
<insert id="saveBusinessMeterWaterInfo" parameterType="Map">
insert into business_meter_water(
remark,cur_reading_time,water_id,cur_degrees,operate,meter_type,pre_degrees,obj_id,pre_reading_time,
- b_id,community_id,obj_type,fee_id,obj_name
+ b_id,community_id,obj_type,fee_id,obj_name,price
) values (
#{remark},#{curReadingTime},#{waterId},#{curDegrees},#{operate},#{meterType},#{preDegrees},#{objId},
- #{preReadingTime},#{bId},#{communityId},#{objType},#{feeId},#{objName}
+ #{preReadingTime},#{bId},#{communityId},#{objType},#{feeId},#{objName},#{price}
)
</insert>
@@ -22,7 +22,7 @@
waterId,t.cur_degrees,t.cur_degrees curDegrees,t.operate,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
+ communityId,t.obj_type,t.obj_type objType,t.fee_id,t.fee_id feeId,t.obj_name,t.obj_name objName,t.price
from business_meter_water t
where 1 =1
<if test="remark !=null and remark != ''">
@@ -72,10 +72,10 @@
<insert id="saveMeterWaterInfoInstance" parameterType="Map">
insert into meter_water(
remark,status_cd,cur_reading_time,water_id,cur_degrees,meter_type,pre_degrees,obj_id,pre_reading_time,b_id,
- community_id,obj_type,fee_id,obj_name
+ community_id,obj_type,fee_id,obj_name,price
) select
t.remark,'0',t.cur_reading_time,t.water_id,t.cur_degrees,t.meter_type,t.pre_degrees,t.obj_id,
- t.pre_reading_time,t.b_id,t.community_id,t.obj_type,t.fee_id,t.obj_name
+ t.pre_reading_time,t.b_id,t.community_id,t.obj_type,t.fee_id,t.obj_name,t.price
from business_meter_water t where 1=1
<if test="remark !=null and remark != ''">
and t.remark= #{remark}
@@ -124,9 +124,10 @@
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
+ 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
- inner join pay_fee pf on t.fee_id = pf.fee_id and pf.status_cd = '0'
+ 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 != ''">
and t.remark= #{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>
@@ -278,11 +277,11 @@
<insert id="insertMeterWaters" parameterType="Map">
insert into meter_water
(remark,status_cd,cur_reading_time,water_id,cur_degrees,meter_type,pre_degrees,obj_id,pre_reading_time,b_id,
- community_id,obj_type,fee_id,obj_name)
+ community_id,obj_type,fee_id,obj_name,price)
VALUES
<foreach collection="meterWaterPos" item="item" separator=",">
(#{item.remark},'0',#{item.curReadingTime},#{item.waterId},#{item.curDegrees},#{item.meterType},#{item.preDegrees},
- #{item.objId},#{item.preReadingTime},'-1',#{item.communityId},#{item.objType},#{item.feeId},#{item.objName})
+ #{item.objId},#{item.preReadingTime},'-1',#{item.communityId},#{item.objType},#{item.feeId},#{item.objName},#{item.price})
</foreach>
</insert>
--
Gitblit v1.8.0