From f42983b35c738a28ed4b9d1732d1045c5f2a19bb Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期日, 09 五月 2021 16:57:12 +0800
Subject: [PATCH] 优化代码
---
java110-db/src/main/resources/mapper/fee/MeterWaterServiceDaoImplMapper.xml | 54 ++++++++++++++++++++++++++++++++++--------------------
1 files changed, 34 insertions(+), 20 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 02f2c0a..6872585
--- 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
+ b_id,community_id,obj_type,fee_id,obj_name
) values (
#{remark},#{curReadingTime},#{waterId},#{curDegrees},#{operate},#{meterType},#{preDegrees},#{objId},
- #{preReadingTime},#{bId},#{communityId},#{objType},#{feeId}
+ #{preReadingTime},#{bId},#{communityId},#{objType},#{feeId},#{objName}
)
</insert>
@@ -19,15 +19,16 @@
<!-- 鏌ヨ姘寸數璐逛俊鎭紙Business锛� add by wuxw 2018-07-03 -->
<select id="getBusinessMeterWaterInfo" parameterType="Map" resultType="Map">
select t.remark,t.cur_reading_time,t.cur_reading_time curReadingTime,t.water_id,t.water_id
- 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
+ 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
+ communityId,t.obj_type,t.obj_type objType,t.fee_id,t.fee_id feeId,t.obj_name,t.obj_name objName
from business_meter_water t
where 1 =1
<if test="remark !=null and remark != ''">
and t.remark= #{remark}
</if>
- <if test="curReadingTime !=null and curReadingTime != ''">
+ <if test="curReadingTime !=null ">
and t.cur_reading_time= #{curReadingTime}
</if>
<if test="waterId !=null and waterId != ''">
@@ -51,7 +52,7 @@
<if test="objId !=null and objId != ''">
and t.obj_id= #{objId}
</if>
- <if test="preReadingTime !=null and preReadingTime != ''">
+ <if test="preReadingTime !=null ">
and t.pre_reading_time= #{preReadingTime}
</if>
<if test="bId !=null and bId != ''">
@@ -70,15 +71,16 @@
<!-- 淇濆瓨姘寸數璐逛俊鎭嚦 instance琛ㄤ腑 add by wuxw 2018-07-03 -->
<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
+ 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
) 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.pre_reading_time,t.b_id,t.community_id,t.obj_type,t.fee_id,t.obj_name
from business_meter_water t where 1=1
<if test="remark !=null and remark != ''">
and t.remark= #{remark}
</if>
- <if test="curReadingTime !=null and curReadingTime != ''">
+ <if test="curReadingTime !=null ">
and t.cur_reading_time= #{curReadingTime}
</if>
<if test="waterId !=null and waterId != ''">
@@ -100,7 +102,7 @@
<if test="objId !=null and objId != ''">
and t.obj_id= #{objId}
</if>
- <if test="preReadingTime !=null and preReadingTime != ''">
+ <if test="preReadingTime !=null ">
and t.pre_reading_time= #{preReadingTime}
</if>
<if test="bId !=null and bId != ''">
@@ -122,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
+ 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
+ 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}
@@ -131,7 +134,7 @@
<if test="statusCd !=null and statusCd != ''">
and t.status_cd= #{statusCd}
</if>
- <if test="curReadingTime !=null and curReadingTime != ''">
+ <if test="curReadingTime !=null ">
and t.cur_reading_time= #{curReadingTime}
</if>
<if test="waterId !=null and waterId != ''">
@@ -152,7 +155,7 @@
<if test="objId !=null and objId != ''">
and t.obj_id= #{objId}
</if>
- <if test="preReadingTime !=null and preReadingTime != ''">
+ <if test="preReadingTime !=null ">
and t.pre_reading_time= #{preReadingTime}
</if>
<if test="bId !=null and bId != ''">
@@ -184,7 +187,7 @@
<if test="remark !=null and remark != ''">
, t.remark= #{remark}
</if>
- <if test="curReadingTime !=null and curReadingTime != ''">
+ <if test="curReadingTime !=null ">
, t.cur_reading_time= #{curReadingTime}
</if>
<if test="curDegrees !=null and curDegrees != ''">
@@ -202,7 +205,7 @@
<if test="objId !=null and objId != ''">
, t.obj_id= #{objId}
</if>
- <if test="preReadingTime !=null and preReadingTime != ''">
+ <if test="preReadingTime !=null ">
, t.pre_reading_time= #{preReadingTime}
</if>
<if test="communityId !=null and communityId != ''">
@@ -225,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}
@@ -232,7 +236,7 @@
<if test="statusCd !=null and statusCd != ''">
and t.status_cd= #{statusCd}
</if>
- <if test="curReadingTime !=null and curReadingTime != ''">
+ <if test="curReadingTime !=null ">
and t.cur_reading_time= #{curReadingTime}
</if>
<if test="waterId !=null and waterId != ''">
@@ -240,9 +244,6 @@
</if>
<if test="curDegrees !=null and curDegrees != ''">
and t.cur_degrees= #{curDegrees}
- </if>
- <if test="createTime !=null and createTime != ''">
- and t.create_time= #{createTime}
</if>
<if test="meterType !=null and meterType != ''">
and t.meter_type= #{meterType}
@@ -253,7 +254,7 @@
<if test="objId !=null and objId != ''">
and t.obj_id= #{objId}
</if>
- <if test="preReadingTime !=null and preReadingTime != ''">
+ <if test="preReadingTime !=null ">
and t.pre_reading_time= #{preReadingTime}
</if>
<if test="bId !=null and bId != ''">
@@ -272,4 +273,17 @@
</select>
+
+ <!-- 鎵归噺鎻掑叆璐圭敤 -->
+ <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)
+ 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})
+ </foreach>
+ </insert>
+
</mapper>
--
Gitblit v1.8.0