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/WarehouseMapper.xml | 27 ++++++++++++++++++++++++++-
1 files changed, 26 insertions(+), 1 deletions(-)
diff --git a/src/main/resources/mapper/warehouse/WarehouseMapper.xml b/src/main/resources/mapper/warehouse/WarehouseMapper.xml
index 0ac5918..dd45695 100644
--- a/src/main/resources/mapper/warehouse/WarehouseMapper.xml
+++ b/src/main/resources/mapper/warehouse/WarehouseMapper.xml
@@ -5,13 +5,38 @@
<mapper namespace="com.ruoyi.warehouse.mapper.WarehouseMapper">
- <select id="listPage" resultType="com.ruoyi.warehouse.pojo.Warehouse">
+ <select id="findList" resultType="com.ruoyi.warehouse.dto.WarehouseDto">
+ SELECT
+ w.*,
+ wgs.name,
+ doc.doc_name,
+ doc.doc_number,
+ dc.category
+ FROM warehouse_goods_shelves_rowcol wgsr
+ LEFT JOIN warehouse_goods_shelves wgs ON wgs.id = wgsr.warehouse_goods_shelves_id
+ LEFT JOIN warehouse w ON w.id = wgs.warehouse_id
+ LEFT JOIN documentation doc ON doc.warehouse_goods_shelves_rowcol_id = wgsr.id
+ LEFT JOIN document_classification dc ON doc.document_classification_id = dc.id
+ <where>
+ 1=1
+ <if test="warehouse.warehouseName != null">
+ and w.warehouse_name like concat('%',#{warehouse.warehouseName},'%')
+ </if>
+ <if test="warehouse.id != null">
+ and w.id = #{warehouse.id}
+ </if>
+ </where>
+ </select>
+ <select id="listAll" resultType="com.ruoyi.warehouse.pojo.Warehouse">
select * from warehouse
<where>
1=1
<if test="warehouse.warehouseName != null">
and warehouse_name like concat('%',#{warehouse.warehouseName},'%')
</if>
+ <if test="warehouse.id != null">
+ and w.id = #{warehouse.id}
+ </if>
</where>
</select>
</mapper>
--
Gitblit v1.9.3