From c6c1bb0b049a3f9bde1761ab0fbf07c22ccd540a Mon Sep 17 00:00:00 2001
From: yaowanxin <3588231647@qq.com>
Date: 星期二, 23 九月 2025 09:52:37 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/resources/mapper/device/DeviceLedgerMapper.xml | 14 ++++++++++++--
1 files changed, 12 insertions(+), 2 deletions(-)
diff --git a/src/main/resources/mapper/device/DeviceLedgerMapper.xml b/src/main/resources/mapper/device/DeviceLedgerMapper.xml
index 4a8f435..6fdef39 100644
--- a/src/main/resources/mapper/device/DeviceLedgerMapper.xml
+++ b/src/main/resources/mapper/device/DeviceLedgerMapper.xml
@@ -13,6 +13,11 @@
dl.supplier_name,
dl.unit,
dl.number,
+ dl.status,
+ dl.planRuntimeTime,
+ dl.startRuntimeTime,
+ dl.endRuntimeTime,
+ dl.runtimeDuration,
dl.tax_including_price_unit,
dl.tax_including_price_total,
dl.tax_rate,
@@ -23,7 +28,7 @@
dl.update_user,
dl.tenant_id
FROM device_ledger dl
- left join sys_user su on dl.create_user = su.user_id
+ left join sys_user su on dl.create_user = su.user_id
<where>
<!-- 璁惧鍚嶇О -->
<if test="deviceLedger.deviceName != null and deviceLedger.deviceName != ''">
@@ -59,7 +64,7 @@
AND dl.create_time >= DATE_FORMAT(#{deviceLedger.entryDateStart},'%Y-%m-%d')
</if>
<if test="deviceLedger.entryDateEnd != null and deviceLedger.entryDateEnd != '' ">
- AND dl.create_time <= DATE_FORMAT(#{deviceLedger.entryDateEnd},'%Y-%m-%d')
+ AND dl.create_time <= DATE_FORMAT(#{deviceLedger.entryDateEnd},'%Y-%m-%d')
</if>
<!-- 绉熸埛ID -->
@@ -72,5 +77,10 @@
<select id="deviceLedgerExportList" resultType="com.ruoyi.device.execl.DeviceLedgerExeclDto">
</select>
+ <select id="selectById1" resultType="com.ruoyi.device.pojo.DeviceLedger">
+ select *
+ from device_ledger
+ where id = #{id}
+ </select>
</mapper>
--
Gitblit v1.9.3