From a62de2fbc299c2f72189899536266140496726fe Mon Sep 17 00:00:00 2001
From: maven <2163098428@qq.com>
Date: 星期四, 04 十二月 2025 16:58:49 +0800
Subject: [PATCH] yys 修改设备管理
---
src/main/java/com/ruoyi/device/pojo/DeviceLedger.java | 4 ++++
src/main/java/com/ruoyi/device/dto/DeviceLedgerDto.java | 4 ++++
src/main/resources/mapper/device/DeviceLedgerMapper.xml | 22 ++--------------------
3 files changed, 10 insertions(+), 20 deletions(-)
diff --git a/src/main/java/com/ruoyi/device/dto/DeviceLedgerDto.java b/src/main/java/com/ruoyi/device/dto/DeviceLedgerDto.java
index 26bdc91..680af8c 100644
--- a/src/main/java/com/ruoyi/device/dto/DeviceLedgerDto.java
+++ b/src/main/java/com/ruoyi/device/dto/DeviceLedgerDto.java
@@ -51,6 +51,10 @@
*/
private BigDecimal number;
+ private String deviceBrand;
+
+ private String storageLocation;
+
/**
* 鍚◣鍗曚环
*/
diff --git a/src/main/java/com/ruoyi/device/pojo/DeviceLedger.java b/src/main/java/com/ruoyi/device/pojo/DeviceLedger.java
index caa8f32..6101426 100644
--- a/src/main/java/com/ruoyi/device/pojo/DeviceLedger.java
+++ b/src/main/java/com/ruoyi/device/pojo/DeviceLedger.java
@@ -75,6 +75,10 @@
*/
private BigDecimal unTaxIncludingPriceTotal;
+ private String deviceBrand;
+
+ private String storageLocation;
+
/**
* 褰曞叆鏃堕棿
*/
diff --git a/src/main/resources/mapper/device/DeviceLedgerMapper.xml b/src/main/resources/mapper/device/DeviceLedgerMapper.xml
index 9cee459..d40caad 100644
--- a/src/main/resources/mapper/device/DeviceLedgerMapper.xml
+++ b/src/main/resources/mapper/device/DeviceLedgerMapper.xml
@@ -7,26 +7,8 @@
<select id="queryPage" resultType="com.ruoyi.device.dto.DeviceLedgerDto">
SELECT
- dl.id,
- dl.device_name,
- dl.device_model,
- dl.supplier_name,
- 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.user_name AS createUser,
- dl.update_user,
- dl.tenant_id
+ dl.*,
+ su.user_name AS createUser
FROM device_ledger dl
left join sys_user su on dl.create_user = su.user_id
<where>
--
Gitblit v1.9.3