Merge branch 'master' of http://8.140.179.55:20000/r/pipIrr-SV

zhubaomin

2024-10-31 156fd9f67912e73b46c02ffe325ea24f21b47720

 pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmLossDayLastMapper.xml

@@ -181,6 +181,9 @@
            <if test="intakeName != null and intakeName != ''">
                and pint.name like CONCAT('%', #{intakeName,jdbcType=VARCHAR}, '%')
            </if>
            <if test="lossAmountGreaterOrEqual != null ">
                and rldl.loss_amount  &gt;= #{lossAmountGreaterOrEqual,jdbcType=DOUBLE}
            </if>
            <if test="startDt != null">
                and rldl.dt &gt;= #{startDt,jdbcType=DATE}
            </if>
@@ -208,6 +211,9 @@
            <if test="intakeName != null and intakeName != ''">
                and pint.name like CONCAT('%', #{intakeName,jdbcType=VARCHAR}, '%')
            </if>
            <if test="lossAmountGreaterOrEqual != null ">
                and rldl.loss_amount  &gt;= #{lossAmountGreaterOrEqual,jdbcType=DOUBLE}
            </if>
            <if test="startDt != null">
                and rldl.dt &gt;= #{startDt,jdbcType=DATE}
            </if>
@@ -215,10 +221,7 @@
                and rldl.dt &lt;= #{endDt,jdbcType=DATE}
            </if>
        </where>
        ORDER BY rldl.dt DESC, rldl.loss_amount DESC
        <!--    <if test="pageCurr != null and pageSize != null">-->
        <!--      LIMIT ${(pageCurr-1)*pageSize}, ${pageSize}-->
        <!--    </if>-->
        ORDER BY rldl.dt_last DESC
        <trim prefix="limit ">
            <if test="start != null and count != null">
                #{start,javaType=Integer,jdbcType=INTEGER}, #{count,javaType=Integer,jdbcType=INTEGER}