From dd6687b118561100e1677e88a9c2f5842a54c531 Mon Sep 17 00:00:00 2001
From: jialh <1972868360@qq.com>
Date: 星期四, 16 四月 2026 18:14:14 +0800
Subject: [PATCH] 水电话费
---
java110-db/src/main/resources/mapper/fee/MeterWaterServiceDaoImplMapper.xml | 620 +++++++++++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 568 insertions(+), 52 deletions(-)
diff --git a/java110-db/src/main/resources/mapper/fee/MeterWaterServiceDaoImplMapper.xml b/java110-db/src/main/resources/mapper/fee/MeterWaterServiceDaoImplMapper.xml
index f22595e..fa531bd 100755
--- a/java110-db/src/main/resources/mapper/fee/MeterWaterServiceDaoImplMapper.xml
+++ b/java110-db/src/main/resources/mapper/fee/MeterWaterServiceDaoImplMapper.xml
@@ -7,12 +7,18 @@
<!-- 淇濆瓨姘寸數璐逛俊鎭� add by wuxw 2018-07-03 -->
<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,price
+ 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,price,
+ power_supply_bureau,household_name,household_number,electric_meter_id,`handler`,is_transferred,
+ company_name_after_transfer,transfer_date,corresponding_household_count,last_payment_date,reading_type,
+ multiplying_factor,unit_price,invoice_amount,amount_difference,auto_deduction,remark2
) values (
- #{remark},#{curReadingTime},#{waterId},#{curDegrees},#{operate},#{meterType},#{preDegrees},#{objId},
- #{preReadingTime},#{bId},#{communityId},#{objType},#{feeId},#{objName},#{price}
- )
+ #{remark},#{curReadingTime},#{waterId},#{curDegrees},#{operate},#{meterType},#{preDegrees},#{objId},
+ #{preReadingTime},#{bId},#{communityId},#{objType},#{feeId},#{objName},#{price},
+ #{powerSupplyBureau},#{householdName},#{householdNumber},#{electricMeterId},#{handler},#{isTransferred},
+ #{companyNameAfterTransfer},#{transferDate},#{correspondingHouseholdCount},#{lastPaymentDate},#{readingType},
+ #{multiplyingFactor},#{unitPrice},#{invoiceAmount},#{amountDifference},#{autoDeduction},#{remark2}
+ )
</insert>
@@ -22,7 +28,14 @@
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,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,
+ t.power_supply_bureau powerSupplyBureau,t.household_name householdName,t.household_number householdNumber,
+ t.electric_meter_id electricMeterId,t.`handler` handler,t.is_transferred isTransferred,
+ t.company_name_after_transfer companyNameAfterTransfer,t.transfer_date transferDate,
+ t.corresponding_household_count correspondingHouseholdCount,t.last_payment_date lastPaymentDate,
+ t.reading_type readingType,t.multiplying_factor multiplyingFactor,t.unit_price unitPrice,
+ t.invoice_amount invoiceAmount,t.amount_difference amountDifference,t.auto_deduction autoDeduction,
+ t.remark2 remark2
from business_meter_water t
where 1 =1
<if test="remark !=null and remark != ''">
@@ -64,18 +77,86 @@
<if test="objType !=null and objType != ''">
and t.obj_type= #{objType}
</if>
-
+ <!-- 鏂板瀛楁鏌ヨ鏉′欢 -->
+ <if test="powerSupplyBureau !=null and powerSupplyBureau != ''">
+ and t.power_supply_bureau= #{powerSupplyBureau}
+ </if>
+ <if test="householdName !=null and householdName != ''">
+ and t.household_name= #{householdName}
+ </if>
+ <if test="householdNumber !=null and householdNumber != ''">
+ and t.household_number= #{householdNumber}
+ </if>
+ <if test="electricMeterId !=null and electricMeterId != ''">
+ and t.electric_meter_id= #{electricMeterId}
+ </if>
+ <if test="handler !=null and handler != ''">
+ and t.`handler`= #{handler}
+ </if>
+ <if test="isTransferred !=null and isTransferred != ''">
+ and t.is_transferred= #{isTransferred}
+ </if>
+ <if test="companyNameAfterTransfer !=null and companyNameAfterTransfer != ''">
+ and t.company_name_after_transfer= #{companyNameAfterTransfer}
+ </if>
+ <if test="transferDate !=null and transferDate != ''">
+ and t.transfer_date= #{transferDate}
+ </if>
+ <if test="correspondingHouseholdCount !=null and correspondingHouseholdCount != ''">
+ and t.corresponding_household_count= #{correspondingHouseholdCount}
+ </if>
+ <if test="lastPaymentDate !=null and lastPaymentDate != ''">
+ and t.last_payment_date= #{lastPaymentDate}
+ </if>
+ <if test="readingType !=null and readingType != ''">
+ and t.reading_type= #{readingType}
+ </if>
+ <if test="multiplyingFactor !=null and multiplyingFactor != ''">
+ and t.multiplying_factor= #{multiplyingFactor}
+ </if>
+ <if test="unitPrice !=null and unitPrice != ''">
+ and t.unit_price= #{unitPrice}
+ </if>
+ <if test="invoiceAmount !=null and invoiceAmount != ''">
+ and t.invoice_amount= #{invoiceAmount}
+ </if>
+ <if test="amountDifference !=null and amountDifference != ''">
+ and t.amount_difference= #{amountDifference}
+ </if>
+ <if test="autoDeduction !=null and autoDeduction != ''">
+ and t.auto_deduction= #{autoDeduction}
+ </if>
+ <if test="remark2 !=null and remark2 != ''">
+ and t.remark2= #{remark2}
+ </if>
</select>
<!-- 淇濆瓨姘寸數璐逛俊鎭嚦 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,obj_name,price
+ water_id,b_id,meter_type,obj_type,obj_id,pre_degrees,cur_degrees,pre_reading_time,cur_reading_time,
+ community_id,status_cd,remark,fee_id,obj_name,price,
+ power_supply_bureau,household_name,household_number,electric_meter_id,`handler`,is_transferred,
+ company_name_after_transfer,transfer_date,corresponding_household_count,last_payment_date,reading_type,
+ multiplying_factor,unit_price,invoice_amount,amount_difference,auto_deduction,remark2,
+ address,write_time,writer,check_apply_company_name,check_apply_dept_project,water_fee_payer,
+ account_number,meter_read_book_no,water_consumption,sewage_treatment_water,collection_standard,
+ arrears_unpaid,late_payment_fine,late_payment_surcharge,fee_payment_status,carry_over_balance,total_payable_amount,
+ road_name,floor_num,door_num,room_num
) 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.price
+ t.water_id,t.b_id,t.meter_type,t.obj_type,t.obj_id,t.pre_degrees,t.cur_degrees,t.pre_reading_time,t.cur_reading_time,
+ t.community_id,'0',t.remark,t.fee_id,t.obj_name,t.price,
+ t.power_supply_bureau,t.household_name,t.household_number,t.electric_meter_id,t.`handler`,t.is_transferred,
+ t.company_name_after_transfer,t.transfer_date,t.corresponding_household_count,t.last_payment_date,t.reading_type,
+ t.multiplying_factor,t.unit_price,t.invoice_amount,t.amount_difference,t.auto_deduction,t.remark2,
+ #{address},#{writeTime},#{writer},#{checkApplyCompanyName},#{checkApplyDeptProject},#{waterFeePayer},
+ #{accountNumber},#{meterReadBookNo},#{waterConsumption},#{sewageTreatmentWater},#{collectionStandard},
+ #{arrearsUnpaid},#{latePaymentFine},#{latePaymentSurcharge},#{feePaymentStatus},#{carryOverBalance},#{totalPayableAmount},
+ SUBSTRING_INDEX(t.obj_name,'-',1),
+ SUBSTRING_INDEX(SUBSTRING_INDEX(t.obj_name,'-',2),'-',-1),
+ SUBSTRING_INDEX(SUBSTRING_INDEX(t.obj_name,'-',3),'-',-1),
+ SUBSTRING_INDEX(t.obj_name,'-',-1)
from business_meter_water t where 1=1
<if test="remark !=null and remark != ''">
and t.remark= #{remark}
@@ -114,20 +195,84 @@
<if test="objType !=null and objType != ''">
and t.obj_type= #{objType}
</if>
-
+ <!-- 鏂板瀛楁绛涢�夋潯浠� -->
+ <if test="powerSupplyBureau !=null and powerSupplyBureau != ''">
+ and t.power_supply_bureau= #{powerSupplyBureau}
+ </if>
+ <if test="householdName !=null and householdName != ''">
+ and t.household_name= #{householdName}
+ </if>
+ <if test="householdNumber !=null and householdNumber != ''">
+ and t.household_number= #{householdNumber}
+ </if>
+ <if test="electricMeterId !=null and electricMeterId != ''">
+ and t.electric_meter_id= #{electricMeterId}
+ </if>
</insert>
<!-- 鏌ヨ姘寸數璐逛俊鎭� add by wuxw 2018-07-03 -->
<select id="getMeterWaterInfo" parameterType="Map" resultType="Map">
- select t.remark,t.status_cd,t.status_cd statusCd,t.cur_reading_time,t.cur_reading_time
- 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,mt.type_name meterTypeName
+ select
+ t.water_id,t.water_id waterId,
+ t.b_id,t.b_id bId,
+ t.meter_type,t.meter_type meterType,
+ t.obj_type,t.obj_type objType,
+ t.obj_id,t.obj_id objId,
+ t.pre_degrees,t.pre_degrees preDegrees,
+ t.cur_degrees,t.cur_degrees curDegrees,
+ t.pre_reading_time,t.pre_reading_time preReadingTime,
+ t.cur_reading_time,t.cur_reading_time curReadingTime,
+ t.community_id,t.community_id communityId,
+ t.status_cd,t.status_cd statusCd,
+ t.remark,t.remark remark,
+ t.fee_id,t.fee_id feeId,
+ t.obj_name,t.obj_name objName,
+ t.price,t.price price,
+ t.power_supply_bureau powerSupplyBureau,
+ t.household_name householdName,
+ t.household_number householdNumber,
+ t.electric_meter_id electricMeterId,
+ t.`handler` handler,
+ t.is_transferred isTransferred,
+ t.company_name_after_transfer companyNameAfterTransfer,
+ t.transfer_date transferDate,
+ t.corresponding_household_count correspondingHouseholdCount,
+ t.last_payment_date lastPaymentDate,
+ t.reading_type readingType,
+ t.multiplying_factor multiplyingFactor,
+ t.unit_price unitPrice,
+ t.invoice_amount invoiceAmount,
+ t.amount_difference amountDifference,
+ t.auto_deduction autoDeduction,
+ t.remark2 remark2,
+ t.address address,
+ t.write_time writeTime,
+ t.writer writer,
+ t.check_apply_company_name checkApplyCompanyName,
+ t.check_apply_dept_project checkApplyDeptProject,
+ t.water_fee_payer waterFeePayer,
+ t.account_number accountNumber,
+ t.meter_read_book_no meterReadBookNo,
+ t.water_consumption waterConsumption,
+ t.sewage_treatment_water sewageTreatmentWater,
+ t.collection_standard collectionStandard,
+ t.arrears_unpaid arrearsUnpaid,
+ t.late_payment_fine latePaymentFine,
+ t.late_payment_surcharge latePaymentSurcharge,
+ t.fee_payment_status feePaymentStatus,
+ t.carry_over_balance carryOverBalance,
+ t.total_payable_amount totalPayableAmount,
+ t.road_name roadName,
+ t.floor_num floorNum,
+ t.door_num doorNum,
+ t.room_num roomNum,
+ mt.type_name meterTypeName,
+ br.road_name roadNameOld
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'
+ left join building_room br on br.room_id = t.obj_id
where 1 =1
<if test="remark !=null and remark != ''">
and t.remark= #{remark}
@@ -171,50 +316,292 @@
<if test="feeId !=null and feeId != ''">
and t.fee_id = #{feeId}
</if>
- order by t.create_time desc
+ <!-- 鏂板瀛楁鏌ヨ鏉′欢 -->
+ <if test="powerSupplyBureau !=null and powerSupplyBureau != ''">
+ and t.power_supply_bureau= #{powerSupplyBureau}
+ </if>
+ <if test="householdName !=null and householdName != ''">
+ and t.household_name= #{householdName}
+ </if>
+ <if test="householdNumber !=null and householdNumber != ''">
+ and t.household_number= #{householdNumber}
+ </if>
+ <if test="electricMeterId !=null and electricMeterId != ''">
+ and t.electric_meter_id= #{electricMeterId}
+ </if>
+ <if test="handler !=null and handler != ''">
+ and t.`handler`= #{handler}
+ </if>
+ <if test="isTransferred !=null and isTransferred != ''">
+ and t.is_transferred= #{isTransferred}
+ </if>
+ <if test="companyNameAfterTransfer !=null and companyNameAfterTransfer != ''">
+ and t.company_name_after_transfer= #{companyNameAfterTransfer}
+ </if>
+ <if test="transferDate !=null and transferDate != ''">
+ and t.transfer_date= #{transferDate}
+ </if>
+ <if test="correspondingHouseholdCount !=null and correspondingHouseholdCount != ''">
+ and t.corresponding_household_count= #{correspondingHouseholdCount}
+ </if>
+ <if test="lastPaymentDate !=null and lastPaymentDate != ''">
+ and t.last_payment_date= #{lastPaymentDate}
+ </if>
+ <if test="readingType !=null and readingType != ''">
+ and t.reading_type= #{readingType}
+ </if>
+ <if test="multiplyingFactor !=null and multiplyingFactor != ''">
+ and t.multiplying_factor= #{multiplyingFactor}
+ </if>
+ <if test="unitPrice !=null and unitPrice != ''">
+ and t.unit_price= #{unitPrice}
+ </if>
+ <if test="invoiceAmount !=null and invoiceAmount != ''">
+ and t.invoice_amount= #{invoiceAmount}
+ </if>
+ <if test="amountDifference !=null and amountDifference != ''">
+ and t.amount_difference= #{amountDifference}
+ </if>
+ <if test="autoDeduction !=null and autoDeduction != ''">
+ and t.auto_deduction= #{autoDeduction}
+ </if>
+ <if test="remark2 !=null and remark2 != ''">
+ and t.remark2= #{remark2}
+ </if>
+ <if test="address !=null and address != ''">
+ and t.address= #{address}
+ </if>
+ <if test="writeTime !=null and writeTime != ''">
+ and t.write_time= #{writeTime}
+ </if>
+ <if test="writer !=null and writer != ''">
+ and t.writer= #{writer}
+ </if>
+ <!-- 鏂板瀛楁鏌ヨ鏉′欢 -->
+ <if test="checkApplyCompanyName !=null and checkApplyCompanyName != ''">
+ and t.check_apply_company_name= #{checkApplyCompanyName}
+ </if>
+ <if test="checkApplyDeptProject !=null and checkApplyDeptProject != ''">
+ and t.check_apply_dept_project= #{checkApplyDeptProject}
+ </if>
+ <if test="waterFeePayer !=null and waterFeePayer != ''">
+ and t.water_fee_payer= #{waterFeePayer}
+ </if>
+ <if test="accountNumber !=null and accountNumber != ''">
+ and t.account_number= #{accountNumber}
+ </if>
+ <if test="meterReadBookNo !=null and meterReadBookNo != ''">
+ and t.meter_read_book_no= #{meterReadBookNo}
+ </if>
+ <if test="waterConsumption !=null and waterConsumption != ''">
+ and t.water_consumption= #{waterConsumption}
+ </if>
+ <if test="sewageTreatmentWater !=null and sewageTreatmentWater != ''">
+ and t.sewage_treatment_water= #{sewageTreatmentWater}
+ </if>
+ <if test="collectionStandard !=null and collectionStandard != ''">
+ and t.collection_standard= #{collectionStandard}
+ </if>
+ <if test="arrearsUnpaid !=null and arrearsUnpaid != ''">
+ and t.arrears_unpaid= #{arrearsUnpaid}
+ </if>
+ <if test="latePaymentFine !=null and latePaymentFine != ''">
+ and t.late_payment_fine= #{latePaymentFine}
+ </if>
+ <if test="latePaymentSurcharge !=null and latePaymentSurcharge != ''">
+ and t.late_payment_surcharge= #{latePaymentSurcharge}
+ </if>
+ <if test="feePaymentStatus !=null and feePaymentStatus != ''">
+ and t.fee_payment_status= #{feePaymentStatus}
+ </if>
+ <if test="carryOverBalance !=null and carryOverBalance != ''">
+ and t.carry_over_balance= #{carryOverBalance}
+ </if>
+ <if test="totalPayableAmount !=null and totalPayableAmount != ''">
+ and t.total_payable_amount= #{totalPayableAmount}
+ </if>
+ <if test="roadName !=null and roadName != ''">
+ and t.road_name= #{roadName}
+ </if>
+ <if test="floorNum !=null and floorNum != ''">
+ and t.floor_num= #{floorNum}
+ </if>
+ <if test="doorNum !=null and doorNum != ''">
+ and t.door_num= #{doorNum}
+ </if>
+ <if test="roomNum !=null and roomNum != ''">
+ and t.room_num= #{roomNum}
+ </if>
+ order by t.create_time desc,t.obj_name asc
<if test="page != -1 and page != null ">
limit #{page}, #{row}
</if>
-
</select>
<!-- 淇敼姘寸數璐逛俊鎭� add by wuxw 2018-07-03 -->
<update id="updateMeterWaterInfoInstance" parameterType="Map">
- update meter_water t set t.status_cd = #{statusCd}
+ update meter_water t set
+ t.status_cd = #{statusCd},
<if test="newBId != null and newBId != ''">
- ,t.b_id = #{newBId}
+ t.b_id = #{newBId},
</if>
- <if test="remark !=null and remark != ''">
- , t.remark= #{remark}
- </if>
- <if test="curReadingTime !=null ">
- , t.cur_reading_time= #{curReadingTime}
- </if>
- <if test="curDegrees !=null and curDegrees != ''">
- , t.cur_degrees= #{curDegrees}
- </if>
- <if test="createTime !=null and createTime != ''">
- , t.create_time= #{createTime}
+ <if test="waterId !=null and waterId != ''">
+ t.water_id = #{waterId},
</if>
<if test="meterType !=null and meterType != ''">
- , t.meter_type= #{meterType}
- </if>
- <if test="preDegrees !=null and preDegrees != ''">
- , t.pre_degrees= #{preDegrees}
- </if>
- <if test="objId !=null and objId != ''">
- , t.obj_id= #{objId}
- </if>
- <if test="preReadingTime !=null ">
- , t.pre_reading_time= #{preReadingTime}
- </if>
- <if test="communityId !=null and communityId != ''">
- , t.community_id= #{communityId}
+ t.meter_type= #{meterType},
</if>
<if test="objType !=null and objType != ''">
- , t.obj_type= #{objType}
+ t.obj_type= #{objType},
</if>
+ <if test="objId !=null and objId != ''">
+ t.obj_id= #{objId},
+ </if>
+ <if test="preDegrees !=null and preDegrees != ''">
+ t.pre_degrees= #{preDegrees},
+ </if>
+ <if test="curDegrees !=null and curDegrees != ''">
+ t.cur_degrees= #{curDegrees},
+ </if>
+ <if test="preReadingTime !=null ">
+ t.pre_reading_time= #{preReadingTime},
+ </if>
+ <if test="curReadingTime !=null ">
+ t.cur_reading_time= #{curReadingTime},
+ </if>
+ <if test="communityId !=null and communityId != ''">
+ t.community_id= #{communityId},
+ </if>
+ <if test="remark !=null and remark != ''">
+ t.remark= #{remark},
+ </if>
+ <if test="feeId !=null and feeId != ''">
+ t.fee_id= #{feeId},
+ </if>
+ <if test="objName !=null and objName != ''">
+ t.obj_name= #{objName},
+ </if>
+ <if test="price !=null and price != ''">
+ t.price= #{price},
+ </if>
+ <!-- 鏂板瀛楁鏇存柊閫昏緫 -->
+ <if test="powerSupplyBureau !=null and powerSupplyBureau != ''">
+ t.power_supply_bureau= #{powerSupplyBureau},
+ </if>
+ <if test="householdName !=null and householdName != ''">
+ t.household_name= #{householdName},
+ </if>
+ <if test="householdNumber !=null and householdNumber != ''">
+ t.household_number= #{householdNumber},
+ </if>
+ <if test="electricMeterId !=null and electricMeterId != ''">
+ t.electric_meter_id= #{electricMeterId},
+ </if>
+ <if test="handler !=null and handler != ''">
+ t.`handler`= #{handler},
+ </if>
+ <if test="isTransferred !=null and isTransferred != ''">
+ t.is_transferred= #{isTransferred},
+ </if>
+ <if test="companyNameAfterTransfer !=null and companyNameAfterTransfer != ''">
+ t.company_name_after_transfer= #{companyNameAfterTransfer},
+ </if>
+ <if test="transferDate !=null and transferDate != ''">
+ t.transfer_date= #{transferDate},
+ </if>
+ <if test="correspondingHouseholdCount !=null and correspondingHouseholdCount != ''">
+ t.corresponding_household_count= #{correspondingHouseholdCount},
+ </if>
+ <if test="lastPaymentDate !=null and lastPaymentDate != ''">
+ t.last_payment_date= #{lastPaymentDate},
+ </if>
+ <if test="readingType !=null and readingType != ''">
+ t.reading_type= #{readingType},
+ </if>
+ <if test="multiplyingFactor !=null and multiplyingFactor != ''">
+ t.multiplying_factor= #{multiplyingFactor},
+ </if>
+ <if test="unitPrice !=null and unitPrice != ''">
+ t.unit_price= #{unitPrice},
+ </if>
+ <if test="invoiceAmount !=null and invoiceAmount != ''">
+ t.invoice_amount= #{invoiceAmount},
+ </if>
+ <if test="amountDifference !=null and amountDifference != ''">
+ t.amount_difference= #{amountDifference},
+ </if>
+ <if test="autoDeduction !=null and autoDeduction != ''">
+ t.auto_deduction= #{autoDeduction},
+ </if>
+ <if test="remark2 !=null and remark2 != ''">
+ t.remark2= #{remark2},
+ </if>
+ <if test="address !=null and address != ''">
+ t.address= #{address},
+ </if>
+ <if test="writeTime !=null and writeTime != ''">
+ t.write_time= #{writeTime},
+ </if>
+ <if test="writer !=null and writer != ''">
+ t.writer= #{writer},
+ </if>
+ <!-- 鏂板姘磋垂鐩稿叧瀛楁鏇存柊閫昏緫 -->
+ <if test="checkApplyCompanyName !=null and checkApplyCompanyName != ''">
+ t.check_apply_company_name= #{checkApplyCompanyName},
+ </if>
+ <if test="checkApplyDeptProject !=null and checkApplyDeptProject != ''">
+ t.check_apply_dept_project= #{checkApplyDeptProject},
+ </if>
+ <if test="waterFeePayer !=null and waterFeePayer != ''">
+ t.water_fee_payer= #{waterFeePayer},
+ </if>
+ <if test="accountNumber !=null and accountNumber != ''">
+ t.account_number= #{accountNumber},
+ </if>
+ <if test="meterReadBookNo !=null and meterReadBookNo != ''">
+ t.meter_read_book_no= #{meterReadBookNo},
+ </if>
+ <if test="waterConsumption !=null and waterConsumption != ''">
+ t.water_consumption= #{waterConsumption},
+ </if>
+ <if test="sewageTreatmentWater !=null and sewageTreatmentWater != ''">
+ t.sewage_treatment_water= #{sewageTreatmentWater},
+ </if>
+ <if test="collectionStandard !=null and collectionStandard != ''">
+ t.collection_standard= #{collectionStandard},
+ </if>
+ <if test="arrearsUnpaid !=null and arrearsUnpaid != ''">
+ t.arrears_unpaid= #{arrearsUnpaid},
+ </if>
+ <if test="latePaymentFine !=null and latePaymentFine != ''">
+ t.late_payment_fine= #{latePaymentFine},
+ </if>
+ <if test="latePaymentSurcharge !=null and latePaymentSurcharge != ''">
+ t.late_payment_surcharge= #{latePaymentSurcharge},
+ </if>
+ <if test="feePaymentStatus !=null and feePaymentStatus != ''">
+ t.fee_payment_status= #{feePaymentStatus},
+ </if>
+ <if test="carryOverBalance !=null and carryOverBalance != ''">
+ t.carry_over_balance= #{carryOverBalance},
+ </if>
+ <if test="totalPayableAmount !=null and totalPayableAmount != ''">
+ t.total_payable_amount= #{totalPayableAmount},
+ </if>
+ <if test="roadName !=null and roadName != ''">
+ t.road_name= #{roadName},
+ </if>
+ <if test="floorNum !=null and floorNum != ''">
+ t.floor_num= #{floorNum},
+ </if>
+ <if test="doorNum !=null and doorNum != ''">
+ t.door_num= #{doorNum},
+ </if>
+ <if test="roomNum !=null and roomNum != ''">
+ t.room_num= #{roomNum},
+ </if>
+ 1=1
where 1=1
<if test="waterId !=null and waterId != ''">
and t.water_id= #{waterId}
@@ -222,7 +609,6 @@
<if test="bId !=null and bId != ''">
and t.b_id= #{bId}
</if>
-
</update>
<!-- 鏌ヨ姘寸數璐规暟閲� add by wuxw 2018-07-03 -->
@@ -270,19 +656,149 @@
<if test="feeId !=null and feeId != ''">
and t.fee_id = #{feeId}
</if>
+ <!-- 鏂板瀛楁璁℃暟绛涢�夋潯浠� -->
+ <if test="powerSupplyBureau !=null and powerSupplyBureau != ''">
+ and t.power_supply_bureau= #{powerSupplyBureau}
+ </if>
+ <if test="householdName !=null and householdName != ''">
+ and t.household_name= #{householdName}
+ </if>
+ <if test="householdNumber !=null and householdNumber != ''">
+ and t.household_number= #{householdNumber}
+ </if>
+ <if test="electricMeterId !=null and electricMeterId != ''">
+ and t.electric_meter_id= #{electricMeterId}
+ </if>
+ <if test="handler !=null and handler != ''">
+ and t.`handler`= #{handler}
+ </if>
+ <if test="isTransferred !=null and isTransferred != ''">
+ and t.is_transferred= #{isTransferred}
+ </if>
+ <if test="companyNameAfterTransfer !=null and companyNameAfterTransfer != ''">
+ and t.company_name_after_transfer= #{companyNameAfterTransfer}
+ </if>
+ <if test="transferDate !=null and transferDate != ''">
+ and t.transfer_date= #{transferDate}
+ </if>
+ <if test="correspondingHouseholdCount !=null and correspondingHouseholdCount != ''">
+ and t.corresponding_household_count= #{correspondingHouseholdCount}
+ </if>
+ <if test="lastPaymentDate !=null and lastPaymentDate != ''">
+ and t.last_payment_date= #{lastPaymentDate}
+ </if>
+ <if test="readingType !=null and readingType != ''">
+ and t.reading_type= #{readingType}
+ </if>
+ <if test="multiplyingFactor !=null and multiplyingFactor != ''">
+ and t.multiplying_factor= #{multiplyingFactor}
+ </if>
+ <if test="unitPrice !=null and unitPrice != ''">
+ and t.unit_price= #{unitPrice}
+ </if>
+ <if test="invoiceAmount !=null and invoiceAmount != ''">
+ and t.invoice_amount= #{invoiceAmount}
+ </if>
+ <if test="amountDifference !=null and amountDifference != ''">
+ and t.amount_difference= #{amountDifference}
+ </if>
+ <if test="autoDeduction !=null and autoDeduction != ''">
+ and t.auto_deduction= #{autoDeduction}
+ </if>
+ <if test="remark2 !=null and remark2 != ''">
+ and t.remark2= #{remark2}
+ </if>
+ <if test="address !=null and address != ''">
+ and t.address= #{address}
+ </if>
+ <if test="writeTime !=null and writeTime != ''">
+ and t.write_time= #{writeTime}
+ </if>
+ <if test="writer !=null and writer != ''">
+ and t.writer= #{writer}
+ </if>
+ <!-- 鏂板姘磋垂瀛楁璁℃暟绛涢�夋潯浠� -->
+ <if test="checkApplyCompanyName !=null and checkApplyCompanyName != ''">
+ and t.check_apply_company_name= #{checkApplyCompanyName}
+ </if>
+ <if test="checkApplyDeptProject !=null and checkApplyDeptProject != ''">
+ and t.check_apply_dept_project= #{checkApplyDeptProject}
+ </if>
+ <if test="waterFeePayer !=null and waterFeePayer != ''">
+ and t.water_fee_payer= #{waterFeePayer}
+ </if>
+ <if test="accountNumber !=null and accountNumber != ''">
+ and t.account_number= #{accountNumber}
+ </if>
+ <if test="meterReadBookNo !=null">
+ and t.meter_read_book_no= #{meterReadBookNo}
+ </if>
+ <if test="waterConsumption !=null and waterConsumption != ''">
+ and t.water_consumption= #{waterConsumption}
+ </if>
+ <if test="sewageTreatmentWater !=null and sewageTreatmentWater != ''">
+ and t.sewage_treatment_water= #{sewageTreatmentWater}
+ </if>
+ <if test="collectionStandard !=null and collectionStandard != ''">
+ and t.collection_standard= #{collectionStandard}
+ </if>
+ <if test="arrearsUnpaid !=null and arrearsUnpaid != ''">
+ and t.arrears_unpaid= #{arrearsUnpaid}
+ </if>
+ <if test="latePaymentFine !=null and latePaymentFine != ''">
+ and t.late_payment_fine= #{latePaymentFine}
+ </if>
+ <if test="latePaymentSurcharge !=null and latePaymentSurcharge != ''">
+ and t.late_payment_surcharge= #{latePaymentSurcharge}
+ </if>
+ <if test="feePaymentStatus !=null and feePaymentStatus != ''">
+ and t.fee_payment_status= #{feePaymentStatus}
+ </if>
+ <if test="carryOverBalance !=null and carryOverBalance != ''">
+ and t.carry_over_balance= #{carryOverBalance}
+ </if>
+ <if test="totalPayableAmount !=null and totalPayableAmount != ''">
+ and t.total_payable_amount= #{totalPayableAmount}
+ </if>
+ <if test="roadName !=null and roadName != ''">
+ and t.road_name= #{roadName}
+ </if>
+ <if test="floorNum !=null and floorNum != ''">
+ and t.floor_num= #{floorNum}
+ </if>
+ <if test="doorNum !=null and doorNum != ''">
+ and t.door_num= #{doorNum}
+ </if>
+ <if test="roomNum !=null and roomNum != ''">
+ and t.room_num= #{roomNum}
+ </if>
</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,price)
+ (water_id,b_id,meter_type,obj_type,obj_id,pre_degrees,cur_degrees,pre_reading_time,cur_reading_time,
+ community_id,status_cd,remark,fee_id,obj_name,price,
+ power_supply_bureau,household_name,household_number,electric_meter_id,`handler`,is_transferred,
+ company_name_after_transfer,transfer_date,corresponding_household_count,last_payment_date,reading_type,
+ multiplying_factor,unit_price,invoice_amount,amount_difference,auto_deduction,remark2,
+ address,write_time,writer,check_apply_company_name,check_apply_dept_project,water_fee_payer,
+ account_number,meter_read_book_no,water_consumption,sewage_treatment_water,collection_standard,
+ arrears_unpaid,late_payment_fine,late_payment_surcharge,fee_payment_status,carry_over_balance,total_payable_amount,
+ road_name,floor_num,door_num,room_num)
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.price})
+ (#{item.waterId},#{item.bId},#{item.meterType},#{item.objType},#{item.objId},#{item.preDegrees},#{item.curDegrees},
+ #{item.preReadingTime},#{item.curReadingTime},#{item.communityId},'0',#{item.remark},#{item.feeId},#{item.objName},#{item.price},
+ #{item.powerSupplyBureau},#{item.householdName},#{item.householdNumber},#{item.electricMeterId},#{item.handler},#{item.isTransferred},
+ #{item.companyNameAfterTransfer},#{item.transferDate},#{item.correspondingHouseholdCount},#{item.lastPaymentDate},#{item.readingType},
+ #{item.multiplyingFactor},#{item.unitPrice},#{item.invoiceAmount},#{item.amountDifference},#{item.autoDeduction},#{item.remark2},
+ #{item.address},#{item.writeTime},#{item.writer},#{item.checkApplyCompanyName},#{item.checkApplyDeptProject},#{item.waterFeePayer},
+ #{item.accountNumber},#{item.meterReadBookNo},#{item.waterConsumption},#{item.sewageTreatmentWater},#{item.collectionStandard},
+ #{item.arrearsUnpaid},#{item.latePaymentFine},#{item.latePaymentSurcharge},#{item.feePaymentStatus},#{item.carryOverBalance},#{item.totalPayableAmount},
+ #{item.roadName},#{item.floorNum},#{item.doorNum},#{item.roomNum})
</foreach>
</insert>
-</mapper>
+</mapper>
\ No newline at end of file
--
Gitblit v1.8.0