Merge branch 'dev_tide_gybjyhglxt' into dev_tide_gybjyhglxt_xindao

zouyu

2 天以前 0febd1ea7218cf2ae28cad07912bf6ba7b881d2c

 src/main/resources/mapper/purchase/PurchaseLedgerMapper.xml

@@ -44,6 +44,9 @@
            <if test="c.entryDateEnd != null and c.entryDateEnd != '' ">
                AND  pl.entry_date &lt;= DATE_FORMAT(#{c.entryDateEnd},'%Y-%m-%d')
            </if>
            <if test="c.recorderId != null and c.recorderId != '' ">
                AND  pl.recorder_id = #{c.recorderId}
            </if>
        </where>
        group by pl.id, pl.purchase_contract_number, pl.sales_contract_no, pl.supplier_name,
        pl.project_name,pl.entry_date,
@@ -51,4 +54,23 @@
        pl.contract_amount

    </select>
    <select id="getPaymentRegistrationDtoById" resultType="com.ruoyi.purchase.dto.PaymentRegistrationDto">
        SELECT
            T1.id,
            T1.payment_date,
            T2.supplier_name,
            T1.current_payment_amount,
            T1.payment_method,
            T3.nick_name AS registrant,
            T1.registrationt_date
        FROM
            payment_registration T1
                LEFT JOIN
            supplier_manage T2 ON T1.supplier_id = T2.id
                LEFT JOIN
            sys_user T3 ON T3.user_id = T1.registrant_id
        left join ticket_registration T4 on T1.ticket_registration_id = T4.id
        WHERE
            T4.id = #{id}
    </select>
</mapper>