From b33e6f53dd537abaebad066de12474580fcc33b2 Mon Sep 17 00:00:00 2001 From: yaowanxin <3588231647@qq.com> Date: 星期四, 21 八月 2025 15:03:14 +0800 Subject: [PATCH] Merge branch 'pim_ywx' --- src/main/resources/mapper/warehouse/DocumentationBorrowManagementMapper.xml | 78 ++++++++++++++++----------------------- 1 files changed, 32 insertions(+), 46 deletions(-) diff --git a/src/main/resources/mapper/warehouse/DocumentationBorrowManagementMapper.xml b/src/main/resources/mapper/warehouse/DocumentationBorrowManagementMapper.xml index f28eadd..18b2082 100644 --- a/src/main/resources/mapper/warehouse/DocumentationBorrowManagementMapper.xml +++ b/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"/> - <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> +<!-- <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,--> @@ -29,11 +29,9 @@ <!-- update_user,tenant_id--> <!-- </sql>--> <select id="listPage" resultType="com.ruoyi.warehouse.dto.DocumentationBorrowManagementDto"> - select dbm.*,doc.doc_name,su.nick_name,sur.nick_name as return_nick_name + select dbm.*,doc.doc_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 - LEFT JOIN sys_user sur on sur.user_id = dbm.returner_id where 1=1 <if test="documentationBorrowManagement.borrowStatus != null"> and borrow_status = #{documentationBorrowManagement.borrowStatus} @@ -41,11 +39,11 @@ <if test="documentationBorrowManagement.documentationId != null"> and documentation_id = #{documentationBorrowManagement.documentationId} </if> - <if test="documentationBorrowManagement.borrowerId != null"> - and borrower_id = #{documentationBorrowManagement.borrowerId} + <if test="documentationBorrowManagement.borrower != null"> + and borrower like concat('%',#{documentationBorrowManagement.borrower},'%') </if> - <if test="documentationBorrowManagement.returnerId != null"> - and returner_id = #{documentationBorrowManagement.returnerId} + <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') @@ -55,10 +53,9 @@ </if> </select> <select id="export" resultType="com.ruoyi.warehouse.dto.DocumentationBorrowManagementDto"> - select dbm.*,doc.doc_name,su.nick_name + select dbm.*,doc.doc_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} @@ -66,8 +63,11 @@ <if test="documentationBorrowManagement.documentationId != null"> and documentation_id = #{documentationBorrowManagement.documentationId} </if> - <if test="documentationBorrowManagement.borrowerId != null"> - and borrower_id = #{documentationBorrowManagement.borrowerId} + <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') @@ -76,27 +76,13 @@ and borrow_date <= 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,sur.nick_name as return_nick_name + <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 - LEFT JOIN sys_user su on su.user_id = dbm.borrower_id - LEFT JOIN sys_user sur on sur.user_id = dbm.returner_id - where sur.nick_name IS NOT NULL - <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 <= DATE_FORMAT(#{documentationBorrowManagement.entryDateEnd},'%Y-%m-%d') + <if test="ew != null"> + ${ew.customSqlSegment} </if> </select> + </mapper> -- Gitblit v1.9.3