仓库，树，文档，借出修改

yaowanxin

6 天以前 9d5128803ebebb5788f13924a5775ac16494dfef

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

@@ -4,22 +4,22 @@
        "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,-->
@@ -40,14 +40,55 @@
        <if test="documentationBorrowManagement.borrowerId != null">
            and borrower_id = #{documentationBorrowManagement.borrowerId}
        </if>
        <if test="documentationBorrowManagement.borrowPurpose != null">
            and borrow_purpose = #{documentationBorrowManagement.borrowPurpose}
        <if test="documentationBorrowManagement.entryDateStart != null and documentationBorrowManagement.entryDateStart != ''">
            and borrow_date >= DATE_FORMAT(#{documentationBorrowManagement.entryDateStart},'%Y-%m-%d')
        </if>
        <if test="documentationBorrowManagement.borrowDate != null">
            and borrow_date = #{documentationBorrowManagement.borrowDate}
        <if test="documentationBorrowManagement.entryDateEnd != null and documentationBorrowManagement.entryDateEnd != ''">
            and borrow_date &lt;= DATE_FORMAT(#{documentationBorrowManagement.entryDateEnd},'%Y-%m-%d')
        </if>
        <if test="documentationBorrowManagement.dueReturnDate != null">
            and due_return_date = #{documentationBorrowManagement.dueReturnDate}
    </select>
    <select id="export" resultType="com.ruoyi.warehouse.dto.DocumentationBorrowManagementDto">
        select dbm.*,doc.doc_name,su.nick_name
        from documentation_borrow_management dbm
        LEFT JOIN documentation doc on doc.id = dbm.documentation_id
        LEFT JOIN sys_user su on su.user_id = dbm.borrower_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.borrowerId != null">
            and borrower_id = #{documentationBorrowManagement.borrowerId}
        </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="exportrevent" resultType="com.ruoyi.warehouse.dto.ReturnExportDto">
        select dbm.*,doc.doc_name,su.nick_name,su.nick_name as return_nick_name
        from documentation_borrow_management dbm
        LEFT JOIN documentation doc on doc.id = dbm.documentation_id
        LEFT JOIN sys_user su on su.user_id = dbm.borrower_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.borrowerId != null">
            and borrower_id = #{documentationBorrowManagement.borrowerId}
        </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>
</mapper>