From b0c345d2a74f47e5c34617051bcd61becde11b96 Mon Sep 17 00:00:00 2001
From: yaowanxin <3588231647@qq.com>
Date: 星期五, 15 八月 2025 14:09:59 +0800
Subject: [PATCH] 业务流程修改

---
 src/main/resources/mapper/warehouse/DocumentationBorrowManagementMapper.xml |   68 ++++++++++++++++++++++-----------
 1 files changed, 45 insertions(+), 23 deletions(-)

diff --git a/src/main/resources/mapper/warehouse/DocumentationBorrowManagementMapper.xml b/src/main/resources/mapper/warehouse/DocumentationBorrowManagementMapper.xml
index cec396b..22e1e8e 100644
--- a/src/main/resources/mapper/warehouse/DocumentationBorrowManagementMapper.xml
+++ b/src/main/resources/mapper/warehouse/DocumentationBorrowManagementMapper.xml
@@ -4,28 +4,50 @@
         "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" 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>-->
 
-    <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.pojo.DocumentationBorrowManagement">
+        select * from documentation_borrow_management
+        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.borrowPurpose != null">
+            and borrow_purpose = #{documentationBorrowManagement.borrowPurpose}
+        </if>
+        <if test="documentationBorrowManagement.borrowDate != null">
+            and borrow_date = #{documentationBorrowManagement.borrowDate}
+        </if>
+        <if test="documentationBorrowManagement.dueReturnDate != null">
+            and due_return_date = #{documentationBorrowManagement.dueReturnDate}
+        </if>
+    </select>
 </mapper>

--
Gitblit v1.9.3