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/WarehouseGoodsShelvesMapper.xml | 43 +++++++++++++++++++++++++++++++++++++------
1 files changed, 37 insertions(+), 6 deletions(-)
diff --git a/src/main/resources/mapper/warehouse/WarehouseGoodsShelvesMapper.xml b/src/main/resources/mapper/warehouse/WarehouseGoodsShelvesMapper.xml
index b186579..8493e2d 100644
--- a/src/main/resources/mapper/warehouse/WarehouseGoodsShelvesMapper.xml
+++ b/src/main/resources/mapper/warehouse/WarehouseGoodsShelvesMapper.xml
@@ -4,16 +4,47 @@
<mapper namespace="com.ruoyi.warehouse.mapper.WarehouseGoodsShelvesMapper">
- <select id="listPage" resultType="com.ruoyi.warehouse.pojo.WarehouseGoodsShelves">
- select * from warehouse_goods_shelves
+ <select id="findList" resultType="com.ruoyi.warehouse.dto.WarehouseGoodsShelvesDto">
+ SELECT
+ doc.doc_name,
+ doc.doc_number,
+ wgs.*,
+ w.warehouse_name,
+ 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="goodsShelvesName != null and goodsShelvesName != ''">
- and goods_shelves_name like concat('%',#{goodsShelvesName},'%')
+ <if test="warehouseGoodsShelves.goodsShelvesName != null and warehouseGoodsShelves.goodsShelvesName != ''">
+ and wgs.goods_shelves_name like concat('%',#{warehouseGoodsShelves.goodsShelvesName},'%')
</if>
- <if test="warehouseId != null">
- and warehouse_id = #{warehouseId}
+ <if test="warehouseGoodsShelves.warehouseId != null">
+ and wgs.warehouse_id = #{warehouseGoodsShelves.warehouseId}
+ </if>
+ <if test="warehouseGoodsShelves.id != null">
+ and wgs.id = #{warehouseGoodsShelves.id}
</if>
</where>
</select>
+ <select id="listAll" resultType="com.ruoyi.warehouse.dto.WarehouseGoodsShelvesDto">
+ select wgs.*,w.warehouse_name from warehouse_goods_shelves wgs
+ LEFT JOIN warehouse w ON w.id = wgs.warehouse_id
+ <where>
+ 1=1
+ <if test="warehouseGoodsShelves.goodsShelvesName != null and warehouseGoodsShelves.goodsShelvesName != ''">
+ and goods_shelves_name like concat('%',#{warehouseGoodsShelves.goodsShelvesName},'%')
+ </if>
+ <if test="warehouseGoodsShelves.warehouseId != null">
+ and warehouse_id = #{warehouseGoodsShelves.warehouseId}
+ </if>
+ <if test="warehouseGoodsShelves.id != null">
+ and id = #{warehouseGoodsShelves.id}
+ </if>
+ </where>
+ </select>
+
+
</mapper>
--
Gitblit v1.9.3