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 | 31 +++++++++++++++----------------
1 files changed, 15 insertions(+), 16 deletions(-)
diff --git a/src/main/resources/mapper/device/DeviceLedgerMapper.xml b/src/main/resources/mapper/device/DeviceLedgerMapper.xml
index 588e518..d40caad 100644
--- a/src/main/resources/mapper/device/DeviceLedgerMapper.xml
+++ b/src/main/resources/mapper/device/DeviceLedgerMapper.xml
@@ -7,23 +7,10 @@
<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.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
+ left join sys_user su on dl.create_user = su.user_id
<where>
<!-- 璁惧鍚嶇О -->
<if test="deviceLedger.deviceName != null and deviceLedger.deviceName != ''">
@@ -55,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}
@@ -65,5 +59,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