From 277b5047d00a3e9094bafd5ecb078976fbf6a92d Mon Sep 17 00:00:00 2001
From: yaowanxin <3588231647@qq.com>
Date: 星期四, 08 一月 2026 18:59:04 +0800
Subject: [PATCH] 华玺砂浆转移-采购代码、发货和发货审核、报修和报修审核、采购模板，查询采购模板接口、财务管理的存货核算数据接口、财务管理的固定资产核算获取台账接口、采购审批,接口、客户分类字段、采购台账字段,实现采购异常记录的添加接口、黑名单,添加资质管理字段,可上传资质文件-至军泰伟业
---
src/main/resources/mapper/device/DeviceLedgerMapper.xml | 23 +++++++++++++++++++++--
1 files changed, 21 insertions(+), 2 deletions(-)
diff --git a/src/main/resources/mapper/device/DeviceLedgerMapper.xml b/src/main/resources/mapper/device/DeviceLedgerMapper.xml
index 588e518..2b14b90 100644
--- a/src/main/resources/mapper/device/DeviceLedgerMapper.xml
+++ b/src/main/resources/mapper/device/DeviceLedgerMapper.xml
@@ -11,19 +11,26 @@
dl.device_name,
dl.device_model,
dl.supplier_name,
+ dl.device_brand,
+ dl.storage_location,
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,
+ su.nick_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
+ left join sys_user su on dl.create_user = su.user_id
<where>
<!-- 璁惧鍚嶇О -->
<if test="deviceLedger.deviceName != null and deviceLedger.deviceName != ''">
@@ -55,6 +62,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 +79,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