From 9f3a45da6d1dc9c71187f15131665eb9806f5588 Mon Sep 17 00:00:00 2001
From: maven <2163098428@qq.com>
Date: 星期二, 28 十月 2025 15:58:03 +0800
Subject: [PATCH] yys 1.修改配置文件 2.增加模板

---
 src/main/resources/mapper/device/DeviceLedgerMapper.xml |   54 ++++++++++++++++++++++++++++++++++++------------------
 1 files changed, 36 insertions(+), 18 deletions(-)

diff --git a/src/main/resources/mapper/device/DeviceLedgerMapper.xml b/src/main/resources/mapper/device/DeviceLedgerMapper.xml
index 43b7472..9cee459 100644
--- a/src/main/resources/mapper/device/DeviceLedgerMapper.xml
+++ b/src/main/resources/mapper/device/DeviceLedgerMapper.xml
@@ -5,24 +5,30 @@
 
 <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.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
+        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 != ''">
@@ -54,6 +60,13 @@
                 AND update_user LIKE CONCAT('%', #{deviceLedger.updateUser}, '%')
             </if>
 
+            <if test="deviceLedger.entryDateStart != null and deviceLedger.entryDateStart != '' ">
+                AND dl.create_time &gt;= DATE_FORMAT(#{deviceLedger.entryDateStart},'%Y-%m-%d')
+            </if>
+            <if test="deviceLedger.entryDateEnd != null and deviceLedger.entryDateEnd != '' ">
+                AND dl.create_time &lt;= DATE_FORMAT(#{deviceLedger.entryDateEnd},'%Y-%m-%d')
+            </if>
+
             <!-- 绉熸埛ID -->
             <if test="deviceLedger.tenantId != null">
                 AND tenant_id = #{deviceLedger.tenantId}
@@ -61,8 +74,13 @@
         </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>
+    <select id="selectById1" resultType="com.ruoyi.device.pojo.DeviceLedger">
+        select *
+        from device_ledger
+        where id = #{id}
+    </select>
 
 </mapper>

--
Gitblit v1.9.3