修改完善3

yaowanxin

3 天以前 8f4db901aa772a808c243f8a4e39522f6f09d5da

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

@@ -4,28 +4,85 @@
        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.ruoyi.warehouse.mapper.DocumentationBorrowManagementMapper">

    <resultMap id="BaseResultMap" type="com.ruoyi.warehouse.pojo.DocumentationBorrowManagement">
            <id property="id" column="id" jdbcType="BIGINT"/>
            <result property="documentationId" column="documentation_id" jdbcType="BIGINT"/>
            <result property="borrowerId" column="borrower_id" jdbcType="BIGINT"/>
            <result property="borrowPurpose" column="borrow_purpose" jdbcType="VARCHAR"/>
            <result property="borrowDate" column="borrow_date" jdbcType="TIMESTAMP"/>
            <result property="dueReturnDate" column="due_return_date" jdbcType="TIMESTAMP"/>
            <result property="returnDate" column="return_date" jdbcType="TIMESTAMP"/>
            <result property="borrowStatus" column="borrow_status" jdbcType="VARCHAR"/>
            <result property="remark" column="remark" jdbcType="VARCHAR"/>
            <result property="createTime" column="create_time" jdbcType="TIMESTAMP"/>
            <result property="createUser" column="create_user" jdbcType="BIGINT"/>
            <result property="updateTime" column="update_time" jdbcType="TIMESTAMP"/>
            <result property="updateUser" column="update_user" jdbcType="BIGINT"/>
            <result property="tenantId" column="tenant_id" jdbcType="BIGINT"/>
    </resultMap>
<!--    <resultMap id="BaseResultMap" type="com.ruoyi.warehouse.pojo.DocumentationBorrowManagement">-->
<!--            <id property="id" column="id"/>-->
<!--            <result property="documentationId" column="documentation_id" />-->
<!--            <result property="borrowerId" column="borrower_id" />-->
<!--            <result property="borrowPurpose" column="borrow_purpose" />-->
<!--            <result property="borrowDate" column="borrow_date"/>-->
<!--            <result property="dueReturnDate" column="due_return_date" />-->
<!--            <result property="returnDate" column="return_date"/>-->
<!--            <result property="borrowStatus" column="borrow_status" />-->
<!--            <result property="remark" column="remark"/>-->
<!--            <result property="createTime" column="create_time"/>-->
<!--            <result property="createUser" column="create_user"/>-->
<!--            <result property="updateTime" column="update_time"/>-->
<!--            <result property="updateUser" column="update_user"/>-->
<!--            <result property="tenantId" column="tenant_id"/>-->
<!--    </resultMap>-->

    <sql id="Base_Column_List">
        id,documentation_id,borrower_id,
        borrow_purpose,borrow_date,due_return_date,
        return_date,borrow_status,remark,
        create_time,create_user,update_time,
        update_user,tenant_id
    </sql>
<!--    <sql id="Base_Column_List">-->
<!--        id,documentation_id,borrower_id,-->
<!--        borrow_purpose,borrow_date,due_return_date,-->
<!--        return_date,borrow_status,remark,-->
<!--        create_time,create_user,update_time,-->
<!--        update_user,tenant_id-->
<!--    </sql>-->
    <select id="listPage" resultType="com.ruoyi.warehouse.dto.DocumentationBorrowManagementDto">
        select dbm.*,doc.doc_name
        from documentation_borrow_management dbm
        LEFT JOIN documentation doc on doc.id = dbm.documentation_id
        where 1=1
        <if test="documentationBorrowManagement.borrowStatus != null">
            and borrow_status = #{documentationBorrowManagement.borrowStatus}
        </if>
        <if test="documentationBorrowManagement.documentationId != null">
            and documentation_id = #{documentationBorrowManagement.documentationId}
        </if>
        <if test="documentationBorrowManagement.borrower != null">
            and borrower like concat('%',#{documentationBorrowManagement.borrower},'%')
        </if>
        <if test="documentationBorrowManagement.returner != null">
            and returner like concat('%',#{documentationBorrowManagement.returner},'%')
        </if>
        <if test="documentationBorrowManagement.entryDateStart != null and documentationBorrowManagement.entryDateStart != ''">
            and borrow_date >= DATE_FORMAT(#{documentationBorrowManagement.entryDateStart},'%Y-%m-%d')
        </if>
        <if test="documentationBorrowManagement.entryDateEnd != null and documentationBorrowManagement.entryDateEnd != ''">
            and borrow_date &lt;= DATE_FORMAT(#{documentationBorrowManagement.entryDateEnd},'%Y-%m-%d')
        </if>
    </select>
    <select id="export" resultType="com.ruoyi.warehouse.dto.DocumentationBorrowManagementDto">
        select dbm.*,doc.doc_name
        from documentation_borrow_management dbm
        LEFT JOIN documentation doc on doc.id = dbm.documentation_id
        where 1=1
        <if test="documentationBorrowManagement.borrowStatus != null">
            and borrow_status = #{documentationBorrowManagement.borrowStatus}
        </if>
        <if test="documentationBorrowManagement.documentationId != null">
            and documentation_id = #{documentationBorrowManagement.documentationId}
        </if>
        <if test="documentationBorrowManagement.borrower != null">
            and borrower like concat('%',#{documentationBorrowManagement.borrower},'%')
        </if>
        <if test="documentationBorrowManagement.returner != null">
            and returner like concat('%',#{documentationBorrowManagement.returner},'%')
        </if>
        <if test="documentationBorrowManagement.entryDateStart != null and documentationBorrowManagement.entryDateStart != ''">
            and borrow_date >= DATE_FORMAT(#{documentationBorrowManagement.entryDateStart},'%Y-%m-%d')
        </if>
        <if test="documentationBorrowManagement.entryDateEnd != null and documentationBorrowManagement.entryDateEnd != ''">
            and borrow_date &lt;= DATE_FORMAT(#{documentationBorrowManagement.entryDateEnd},'%Y-%m-%d')
        </if>
    </select>
    <select id="list" resultType="com.ruoyi.warehouse.dto.DocumentationBorrowManagementDto">
        select dbm.*,doc.doc_name
        from documentation_borrow_management dbm
        LEFT JOIN documentation doc on doc.id = dbm.documentation_id
        <if test="ew != null">
            ${ew.customSqlSegment}
        </if>
    </select>

</mapper>