Merge branch 'master' of http://git.homecommunity.cn/supervip/MicroCommunity

java110

2023-03-29 0b04f664887c73e90bf684a4e69c0fdbfe26349d

 java110-db/src/main/resources/mapper/fee/FeeReceiptDetailServiceDaoImplMapper.xml

@@ -9,8 +9,14 @@
    <insert id="saveFeeReceiptDetailInfo" parameterType="Map">
        insert into fee_receipt_detail(
        area,amount,fee_name,detail_id,start_time,end_time,community_id,receipt_id,fee_id,cycle,square_price
        <if test="createTime != null">
            ,create_time
        </if>
        ) values (
        #{area},#{amount},#{feeName},#{detailId},#{startTime},#{endTime},#{communityId},#{receiptId},#{feeId},#{cycle},#{squarePrice}
        <if test="createTime != null">
            ,#{createTime}
        </if>
        )
    </insert>

@@ -32,13 +38,16 @@
        select t.area,t.amount,t.fee_name,t.fee_name feeName,t.detail_id,t.detail_id detailId,t.start_time,t.start_time
        startTime,t.status_cd,t.status_cd statusCd,t.end_time,t.end_time endTime,t.community_id,t.community_id
        communityId,t.receipt_id,t.receipt_id receiptId,t.fee_id,t.fee_id feeId,t.cycle,t.square_price squarePrice,
        pfd.remark,pf.fee_flag feeFlag
        pfd.remark,pf.fee_flag feeFlag,mw.pre_degrees preDegrees,mw.cur_degrees curDegrees,d.name primeRate,
        pfc.units,pfd.pay_order_id payOrderId
        from fee_receipt_detail t
        left join pay_fee_detail pfd on t.detail_id = pfd.detail_id and pfd.status_cd = '0' and t.community_id =
        pfd.community_id
        left join pay_fee pf on t.fee_id = pf.fee_id and pf.status_cd = '0' and t.community_id = pf.community_id
        left join pay_fee_config pfc on pf.config_id = pfc.config_id and pfc.status_cd = '0'
        LEFT JOIN meter_water mw on t.fee_id = mw.fee_id and mw.status_cd = '0' and t.community_id = mw.community_id
        left join t_dict d on pfd.prime_rate = d.status_cd and d.table_name="pay_fee_detail" and  d.table_columns='prime_rate'
        where 1 =1

        <if test="area !=null and area != ''">
            and t.area= #{area}
        </if>
@@ -88,6 +97,7 @@
        <if test="page != -1 and page != null ">
            limit #{page}, #{row}
        </if>


    </select>

@@ -170,6 +180,12 @@
                #{item}
            </foreach>
        </if>
        <if test="detailIds !=null">
            and t.detail_id in
            <foreach collection="detailIds" item="item" open="(" close=")" separator=",">
                #{item}
            </foreach>
        </if>
        <if test="feeId !=null and feeId != ''">
            and t.fee_id= #{feeId}
        </if>