Merge branch 'refs/heads/dev_New_pro' into dev_宁夏_英泽防锈

云

9 小时以前 620bb4712a31791231c4381581f0f60088f079fe

 src/main/resources/mapper/warehouse/DocumentationReturnManagementMapper.xml

@@ -28,6 +28,7 @@
        <if test="documentationReturnManagement.entryDateEnd != null and documentationReturnManagement.entryDateEnd != ''">
            and return_date &lt;= DATE_FORMAT(#{documentationReturnManagement.entryDateEnd},'%Y-%m-%d')
        </if>
        order by dbm.create_time desc
    </select>

    <select id="exportrevent" resultType="com.ruoyi.warehouse.dto.ReturnExportDto">
@@ -35,8 +36,8 @@
        from documentation_return_management dbm
        LEFT JOIN documentation doc on doc.id = dbm.documentation_id
        where dbm.returner IS NOT NULL
        <if test="documentationReturnManagement.returnStatus != null">
            and return_status = #{documentationReturnManagement.returnStatus}
        <if test="documentationReturnManagement.borrowStatus != null">
            and borrow_status = #{documentationReturnManagement.borrowStatus}
        </if>
        <if test="documentationReturnManagement.documentationId != null">
            and documentation_id = #{documentationReturnManagement.documentationId}