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/device/DeviceLedgerMapper.xml | 24 ++++++++++++++++++++++--
1 files changed, 22 insertions(+), 2 deletions(-)
diff --git a/src/main/resources/mapper/device/DeviceLedgerMapper.xml b/src/main/resources/mapper/device/DeviceLedgerMapper.xml
index d40caad..2b14b90 100644
--- a/src/main/resources/mapper/device/DeviceLedgerMapper.xml
+++ b/src/main/resources/mapper/device/DeviceLedgerMapper.xml
@@ -7,8 +7,28 @@
<select id="queryPage" resultType="com.ruoyi.device.dto.DeviceLedgerDto">
SELECT
- dl.*,
- su.user_name AS createUser
+ dl.id,
+ dl.device_name,
+ dl.device_model,
+ dl.supplier_name,
+ dl.device_brand,
+ dl.storage_location,
+ dl.unit,
+ dl.number,
+ dl.status,
+ dl.plan_runtime_time,
+ dl.start_runtime_time,
+ dl.end_runtime_time,
+ dl.runtime_duration,
+ dl.tax_including_price_unit,
+ dl.tax_including_price_total,
+ dl.tax_rate,
+ dl.un_tax_including_price_total,
+ dl.create_time,
+ dl.update_time ,
+ su.nick_name AS createUser,
+ dl.update_user,
+ dl.tenant_id
FROM device_ledger dl
left join sys_user su on dl.create_user = su.user_id
<where>
--
Gitblit v1.9.3