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/resources/mapper/device/DeviceLedgerMapper.xml | 36 ++++++++++++++++++------------------
1 files changed, 18 insertions(+), 18 deletions(-)
diff --git a/src/main/resources/mapper/device/DeviceLedgerMapper.xml b/src/main/resources/mapper/device/DeviceLedgerMapper.xml
index 43b7472..d40caad 100644
--- a/src/main/resources/mapper/device/DeviceLedgerMapper.xml
+++ b/src/main/resources/mapper/device/DeviceLedgerMapper.xml
@@ -5,24 +5,12 @@
<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.*,
+ su.user_name AS createUser
+ 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 +42,13 @@
AND update_user LIKE CONCAT('%', #{deviceLedger.updateUser}, '%')
</if>
+ <if test="deviceLedger.entryDateStart != null and deviceLedger.entryDateStart != '' ">
+ 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')
+ </if>
+
<!-- 绉熸埛ID -->
<if test="deviceLedger.tenantId != null">
AND tenant_id = #{deviceLedger.tenantId}
@@ -61,8 +56,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