jialh
1 天以前 dd6687b118561100e1677e88a9c2f5842a54c531
java110-db/src/main/resources/mapper/fee/MeterWaterServiceDaoImplMapper.xml
@@ -142,7 +142,8 @@
        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
        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.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,
@@ -151,7 +152,11 @@
        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}
        #{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}
@@ -258,8 +263,12 @@
        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 roadName
        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'
@@ -411,6 +420,18 @@
        <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}
@@ -423,151 +444,164 @@
        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="waterId !=null and waterId != ''">
            ,t.water_id = #{waterId}
            t.water_id = #{waterId},
        </if>
        <if test="meterType !=null and meterType != ''">
            , t.meter_type= #{meterType}
            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}
            t.obj_id= #{objId},
        </if>
        <if test="preDegrees !=null and preDegrees != ''">
            , t.pre_degrees= #{preDegrees}
            t.pre_degrees= #{preDegrees},
        </if>
        <if test="curDegrees !=null and curDegrees != ''">
            , t.cur_degrees= #{curDegrees}
            t.cur_degrees= #{curDegrees},
        </if>
        <if test="preReadingTime !=null ">
            , t.pre_reading_time= #{preReadingTime}
            t.pre_reading_time= #{preReadingTime},
        </if>
        <if test="curReadingTime !=null ">
            , t.cur_reading_time= #{curReadingTime}
            t.cur_reading_time= #{curReadingTime},
        </if>
        <if test="communityId !=null and communityId != ''">
            , t.community_id= #{communityId}
            t.community_id= #{communityId},
        </if>
        <if test="remark !=null and remark != ''">
            , t.remark= #{remark}
            t.remark= #{remark},
        </if>
        <if test="feeId !=null and feeId != ''">
            , t.fee_id= #{feeId}
            t.fee_id= #{feeId},
        </if>
        <if test="objName !=null and objName != ''">
            , t.obj_name= #{objName}
            t.obj_name= #{objName},
        </if>
        <if test="price !=null and price != ''">
            , t.price= #{price}
            t.price= #{price},
        </if>
        <!-- 新增字段更新逻辑 -->
        <if test="powerSupplyBureau !=null and powerSupplyBureau != ''">
            , t.power_supply_bureau= #{powerSupplyBureau}
            t.power_supply_bureau= #{powerSupplyBureau},
        </if>
        <if test="householdName !=null and householdName != ''">
            , t.household_name= #{householdName}
            t.household_name= #{householdName},
        </if>
        <if test="householdNumber !=null and householdNumber != ''">
            , t.household_number= #{householdNumber}
            t.household_number= #{householdNumber},
        </if>
        <if test="electricMeterId !=null and electricMeterId != ''">
            , t.electric_meter_id= #{electricMeterId}
            t.electric_meter_id= #{electricMeterId},
        </if>
        <if test="handler !=null and handler != ''">
            , t.`handler`= #{handler}
            t.`handler`= #{handler},
        </if>
        <if test="isTransferred !=null and isTransferred != ''">
            , t.is_transferred= #{isTransferred}
            t.is_transferred= #{isTransferred},
        </if>
        <if test="companyNameAfterTransfer !=null and companyNameAfterTransfer != ''">
            , t.company_name_after_transfer= #{companyNameAfterTransfer}
            t.company_name_after_transfer= #{companyNameAfterTransfer},
        </if>
        <if test="transferDate !=null and transferDate != ''">
            , t.transfer_date= #{transferDate}
            t.transfer_date= #{transferDate},
        </if>
        <if test="correspondingHouseholdCount !=null and correspondingHouseholdCount != ''">
            , t.corresponding_household_count= #{correspondingHouseholdCount}
            t.corresponding_household_count= #{correspondingHouseholdCount},
        </if>
        <if test="lastPaymentDate !=null and lastPaymentDate != ''">
            , t.last_payment_date= #{lastPaymentDate}
            t.last_payment_date= #{lastPaymentDate},
        </if>
        <if test="readingType !=null and readingType != ''">
            , t.reading_type= #{readingType}
            t.reading_type= #{readingType},
        </if>
        <if test="multiplyingFactor !=null and multiplyingFactor != ''">
            , t.multiplying_factor= #{multiplyingFactor}
            t.multiplying_factor= #{multiplyingFactor},
        </if>
        <if test="unitPrice !=null and unitPrice != ''">
            , t.unit_price= #{unitPrice}
            t.unit_price= #{unitPrice},
        </if>
        <if test="invoiceAmount !=null and invoiceAmount != ''">
            , t.invoice_amount= #{invoiceAmount}
            t.invoice_amount= #{invoiceAmount},
        </if>
        <if test="amountDifference !=null and amountDifference != ''">
            , t.amount_difference= #{amountDifference}
            t.amount_difference= #{amountDifference},
        </if>
        <if test="autoDeduction !=null and autoDeduction != ''">
            , t.auto_deduction= #{autoDeduction}
            t.auto_deduction= #{autoDeduction},
        </if>
        <if test="remark2 !=null and remark2 != ''">
            , t.remark2= #{remark2}
            t.remark2= #{remark2},
        </if>
        <if test="address !=null and address != ''">
            , t.address= #{address}
            t.address= #{address},
        </if>
        <if test="writeTime !=null and writeTime != ''">
            , t.write_time= #{writeTime}
            t.write_time= #{writeTime},
        </if>
        <if test="writer !=null and writer != ''">
            , t.writer= #{writer}
            t.writer= #{writer},
        </if>
        <!-- 新增水费相关字段更新逻辑 -->
        <if test="checkApplyCompanyName !=null and checkApplyCompanyName != ''">
            , t.check_apply_company_name= #{checkApplyCompanyName}
            t.check_apply_company_name= #{checkApplyCompanyName},
        </if>
        <if test="checkApplyDeptProject !=null and checkApplyDeptProject != ''">
            , t.check_apply_dept_project= #{checkApplyDeptProject}
            t.check_apply_dept_project= #{checkApplyDeptProject},
        </if>
        <if test="waterFeePayer !=null and waterFeePayer != ''">
            , t.water_fee_payer= #{waterFeePayer}
            t.water_fee_payer= #{waterFeePayer},
        </if>
        <if test="accountNumber !=null and accountNumber != ''">
            , t.account_number= #{accountNumber}
            t.account_number= #{accountNumber},
        </if>
        <if test="meterReadBookNo !=null and meterReadBookNo != ''">
            , t.meter_read_book_no= #{meterReadBookNo}
            t.meter_read_book_no= #{meterReadBookNo},
        </if>
        <if test="waterConsumption !=null and waterConsumption != ''">
            , t.water_consumption= #{waterConsumption}
            t.water_consumption= #{waterConsumption},
        </if>
        <if test="sewageTreatmentWater !=null and sewageTreatmentWater != ''">
            , t.sewage_treatment_water= #{sewageTreatmentWater}
            t.sewage_treatment_water= #{sewageTreatmentWater},
        </if>
        <if test="collectionStandard !=null and collectionStandard != ''">
            , t.collection_standard= #{collectionStandard}
            t.collection_standard= #{collectionStandard},
        </if>
        <if test="arrearsUnpaid !=null and arrearsUnpaid != ''">
            , t.arrears_unpaid= #{arrearsUnpaid}
            t.arrears_unpaid= #{arrearsUnpaid},
        </if>
        <if test="latePaymentFine !=null and latePaymentFine != ''">
            , t.late_payment_fine= #{latePaymentFine}
            t.late_payment_fine= #{latePaymentFine},
        </if>
        <if test="latePaymentSurcharge !=null and latePaymentSurcharge != ''">
            , t.late_payment_surcharge= #{latePaymentSurcharge}
            t.late_payment_surcharge= #{latePaymentSurcharge},
        </if>
        <if test="feePaymentStatus !=null and feePaymentStatus != ''">
            , t.fee_payment_status= #{feePaymentStatus}
            t.fee_payment_status= #{feePaymentStatus},
        </if>
        <if test="carryOverBalance !=null and carryOverBalance != ''">
            , t.carry_over_balance= #{carryOverBalance}
            t.carry_over_balance= #{carryOverBalance},
        </if>
        <if test="totalPayableAmount !=null and totalPayableAmount != ''">
            , t.total_payable_amount= #{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}
@@ -726,6 +760,18 @@
        <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>
@@ -739,7 +785,8 @@
        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)
        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.waterId},#{item.bId},#{item.meterType},#{item.objType},#{item.objId},#{item.preDegrees},#{item.curDegrees},
@@ -749,7 +796,8 @@
            #{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.arrearsUnpaid},#{item.latePaymentFine},#{item.latePaymentSurcharge},#{item.feePaymentStatus},#{item.carryOverBalance},#{item.totalPayableAmount},
            #{item.roadName},#{item.floorNum},#{item.doorNum},#{item.roomNum})
        </foreach>
    </insert>