Merge branch 'prod' into dev_tide

zouyu

2025-11-14 113cd73922b9b67c261c19c744e46eb2822d7b41

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

对比新文件
@@ -0,0 +1,57 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper
        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.ruoyi.warehouse.mapper.DocumentationReturnManagementMapper">


    <select id="listPage" resultType="com.ruoyi.warehouse.dto.DocumentationReturnManagementDto">
        select dbm.*,doc.doc_name
        from documentation_return_management dbm
        LEFT JOIN documentation doc on doc.id = dbm.documentation_id
        where 1=1
        <if test="documentationReturnManagement.borrowStatus != null">
            and borrow_status = #{documentationReturnManagement.borrowStatus}
        </if>
        <if test="documentationReturnManagement.documentationId != null">
            and documentation_id = #{documentationReturnManagement.documentationId}
        </if>
        <if test="documentationReturnManagement.borrower != null">
            and borrower like concat('%',#{documentationReturnManagement.borrower},'%')
        </if>
        <if test="documentationReturnManagement.returner != null">
            and returner like concat('%',#{documentationReturnManagement.returner},'%')
        </if>
        <if test="documentationReturnManagement.entryDateStart != null and documentationReturnManagement.entryDateStart != ''">
            and return_date >= DATE_FORMAT(#{documentationReturnManagement.entryDateStart},'%Y-%m-%d')
        </if>
        <if test="documentationReturnManagement.entryDateEnd != null and documentationReturnManagement.entryDateEnd != ''">
            and return_date &lt;= DATE_FORMAT(#{documentationReturnManagement.entryDateEnd},'%Y-%m-%d')
        </if>
    </select>

    <select id="exportrevent" resultType="com.ruoyi.warehouse.dto.ReturnExportDto">
        select dbm.*,doc.doc_name
        from documentation_return_management dbm
        LEFT JOIN documentation doc on doc.id = dbm.documentation_id
        where dbm.returner IS NOT NULL
        <if test="documentationReturnManagement.borrowStatus != null">
            and borrow_status = #{documentationReturnManagement.borrowStatus}
        </if>
        <if test="documentationReturnManagement.documentationId != null">
            and documentation_id = #{documentationReturnManagement.documentationId}
        </if>
        <if test="documentationReturnManagement.borrower != null">
            and borrower like concat('%',#{documentationReturnManagement.borrower},'%')
        </if>
        <if test="documentationReturnManagement.returner != null">
            and returner like concat('%',#{documentationReturnManagement.returner},'%')
        </if>
        <if test="documentationReturnManagement.entryDateStart != null and documentationReturnManagement.entryDateStart != ''">
            and return_date >= DATE_FORMAT(#{documentationReturnManagement.entryDateStart},'%Y-%m-%d')
        </if>
        <if test="documentationReturnManagement.entryDateEnd != null and documentationReturnManagement.entryDateEnd != ''">
            and return_date &lt;= DATE_FORMAT(#{documentationReturnManagement.entryDateEnd},'%Y-%m-%d')
        </if>
    </select>
</mapper>