From dd69bfc1fb8e5e28dde754fab7f23bfb1a18faa5 Mon Sep 17 00:00:00 2001
From: liding <756868258@qq.com>
Date: 星期五, 05 六月 2026 16:58:07 +0800
Subject: [PATCH] config(dev): 更新开发环境配置和文件上传功能 - 调整文件上传路径配置 - 修复OA环境文件链接前缀配置 - 在审批实例服务中添加报销相关数据删除逻辑 - 实现申请人姓名自动填充功能 - 添加文件下载预览路由的正则表达式支持 - 为企业新闻VO添加附件列表兼容别名 - 完善员工入职服务的异常处理 - 新增账户附件管理控制器 - 实现文件上传接口并返回完整文件信息
---
src/main/resources/mapper/warehouse/DocumentationBorrowManagementMapper.xml | 103 ++++++++++++++++++++++++++++++++++++++++-----------
1 files changed, 80 insertions(+), 23 deletions(-)
diff --git a/src/main/resources/mapper/warehouse/DocumentationBorrowManagementMapper.xml b/src/main/resources/mapper/warehouse/DocumentationBorrowManagementMapper.xml
index cec396b..18b2082 100644
--- a/src/main/resources/mapper/warehouse/DocumentationBorrowManagementMapper.xml
+++ b/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 <= 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 <= 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>
--
Gitblit v1.9.3