From e2aa651db9f17d58819329de571037edc0f9eba2 Mon Sep 17 00:00:00 2001
From: yaowanxin <3588231647@qq.com>
Date: 星期一, 23 六月 2025 18:13:37 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/resources/mapper/device/DeviceLedgerMapper.xml | 37 +++++++++++++++++++------------------
1 files changed, 19 insertions(+), 18 deletions(-)
diff --git a/src/main/resources/mapper/device/DeviceLedgerMapper.xml b/src/main/resources/mapper/device/DeviceLedgerMapper.xml
index 43b7472..588e518 100644
--- a/src/main/resources/mapper/device/DeviceLedgerMapper.xml
+++ b/src/main/resources/mapper/device/DeviceLedgerMapper.xml
@@ -5,24 +5,25 @@
<mapper namespace="com.ruoyi.device.mapper.DeviceLedgerMapper">
- <select id="queryPage" resultType="com.ruoyi.device.pojo.DeviceLedger">
+ <select id="queryPage" resultType="com.ruoyi.device.dto.DeviceLedgerDto">
SELECT
- id,
- device_name AS deviceName,
- device_model AS deviceModel,
- supplier_name AS supplierName,
- unit,
- number,
- tax_including_price_unit AS taxIncludingPriceUnit,
- tax_including_price_total AS taxIncludingPriceTotal,
- tax_rate AS taxRate,
- un_tax_including_price_total AS unTaxIncludingPriceTotal,
- create_time AS createTime,
- update_time AS updateTime,
- create_user AS createUser,
- update_user AS updateUser,
- tenant_id AS tenantId
- FROM device_ledger
+ dl.id,
+ dl.device_name,
+ dl.device_model,
+ dl.supplier_name,
+ dl.unit,
+ dl.number,
+ 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
+ FROM device_ledger dl
+ left join sys_user su on dl.create_user = su.user_id
<where>
<!-- 璁惧鍚嶇О -->
<if test="deviceLedger.deviceName != null and deviceLedger.deviceName != ''">
@@ -61,7 +62,7 @@
</where>
ORDER BY create_time DESC
</select>
- <select id="deviceLedgerExportList" resultType="com.ruoyi.device.dto.DeviceLedgerExeclDto">
+ <select id="deviceLedgerExportList" resultType="com.ruoyi.device.execl.DeviceLedgerExeclDto">
</select>
--
Gitblit v1.9.3