From 2d9f1f41744f49377a7ec930635d4889b9d355c6 Mon Sep 17 00:00:00 2001
From: kongdeqiang <123456>
Date: 星期二, 01 四月 2025 16:04:00 +0800
Subject: [PATCH] fix: 修改设备添加逻辑
---
platformx-device-biz/src/main/resources/mapper/ReceivingNoteMapper.xml | 11 ++++++++++-
1 files changed, 10 insertions(+), 1 deletions(-)
diff --git a/platformx-device-biz/src/main/resources/mapper/ReceivingNoteMapper.xml b/platformx-device-biz/src/main/resources/mapper/ReceivingNoteMapper.xml
index 2ad25b2..e75ca39 100644
--- a/platformx-device-biz/src/main/resources/mapper/ReceivingNoteMapper.xml
+++ b/platformx-device-biz/src/main/resources/mapper/ReceivingNoteMapper.xml
@@ -25,17 +25,26 @@
rn.release_date ,
rn.release_code,
dm.manufacturer_name,
- sd.name deptName
+ sd.name deptName,
+ c.name contractName
from
receiving_note rn
join device_manufacturer dm on
rn.manufacturer_id = dm.id
join platformxx_boot.sys_dept sd on
rn.dept_id = sd.dept_id
+ join contract c on
+ c.id = rn.contract_id
where
rn.del_flag = '0'
<if test="queryDTO.releaseCode != null and queryDTO.releaseCode !=''">
and rn.release_code like CONCAT('%', #{queryDTO.releaseCode}, '%')
</if>
+ <if test="queryDTO.contractName != null and queryDTO.contractName !=''">
+ and c.name like CONCAT('%', #{queryDTO.contractName}, '%')
+ </if>
+ order by
+ rn.create_time
+ desc
</select>
</mapper>
--
Gitblit v1.9.1