From bd897b186f4dd82beb5a9f9f7f41555dcd77bf7e Mon Sep 17 00:00:00 2001
From: yaowanxin <3588231647@qq.com>
Date: 星期三, 07 一月 2026 14:35:46 +0800
Subject: [PATCH] 设备报修增添审批人id，维修价格字段，重整状态对应值。优化添加设备报修接口，同步数据到协同办公-报销管理。协同办公-报销管理的审核接口同步设备管理-设备报修状态。设备报修删除接口根据报销管理审核状态判断是否删除。
---
src/main/resources/mapper/warehouse/DocumentationMapper.xml | 33 +++++++++++++++++++++++++++++++++
1 files changed, 33 insertions(+), 0 deletions(-)
diff --git a/src/main/resources/mapper/warehouse/DocumentationMapper.xml b/src/main/resources/mapper/warehouse/DocumentationMapper.xml
index f5f9f73..91f17a9 100644
--- a/src/main/resources/mapper/warehouse/DocumentationMapper.xml
+++ b/src/main/resources/mapper/warehouse/DocumentationMapper.xml
@@ -50,5 +50,38 @@
LEFT JOIN warehouse w ON w.id = wgs.warehouse_id
where doc.document_classification_id = #{documentClassificationId}
</select>
+ <select id="list" resultType="com.ruoyi.warehouse.dto.DocumentationDto">
+ SELECT
+ doc.*,
+ dc.category,
+ CONCAT(
+ w.warehouse_name, '-',
+ wgs.name, '-',
+ wgsr.row, '灞�-',
+ wgsr.col, '鍒�'
+ ) AS location_info -- 鍚堝苟鍚庣殑瀛楁鍚�
+ FROM documentation doc
+ LEFT JOIN document_classification dc ON doc.document_classification_id = dc.id
+ LEFT JOIN warehouse_goods_shelves_rowcol wgsr ON wgsr.id = doc.warehouse_goods_shelves_rowcol_id
+ LEFT JOIN warehouse_goods_shelves wgs ON wgs.id = wgsr.warehouse_goods_shelves_id
+ LEFT JOIN warehouse w ON w.id = wgs.warehouse_id
+ </select>
+ <select id="listBywarehouseGoodsShelvesRowcolId" resultType="com.ruoyi.warehouse.dto.DocumentationDto">
+ SELECT
+ doc.*,
+ dc.category,
+ CONCAT(
+ w.warehouse_name, '-',
+ wgs.name, '-',
+ wgsr.row, '灞�-',
+ wgsr.col, '鍒�'
+ ) AS location_info -- 鍚堝苟鍚庣殑瀛楁鍚�
+ FROM documentation doc
+ LEFT JOIN document_classification dc ON doc.document_classification_id = dc.id
+ LEFT JOIN warehouse_goods_shelves_rowcol wgsr ON wgsr.id = doc.warehouse_goods_shelves_rowcol_id
+ LEFT JOIN warehouse_goods_shelves wgs ON wgs.id = wgsr.warehouse_goods_shelves_id
+ LEFT JOIN warehouse w ON w.id = wgs.warehouse_id
+ where doc.warehouse_goods_shelves_rowcol_id = #{warehouseGoodsShelvesRowcolId}
+ </select>
</mapper>
--
Gitblit v1.9.3