From adf58ddc0337678c2a6770fe8687e54a44998c0d Mon Sep 17 00:00:00 2001
From: kongdeqiang <123456>
Date: 星期三, 02 四月 2025 15:43:12 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
platformx-device-biz/src/main/resources/mapper/ReceivingNoteMapper.xml | 12 +++++++++++-
1 files changed, 11 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 456c1da..1a883c5 100644
--- a/platformx-device-biz/src/main/resources/mapper/ReceivingNoteMapper.xml
+++ b/platformx-device-biz/src/main/resources/mapper/ReceivingNoteMapper.xml
@@ -21,22 +21,32 @@
<select id="pageNew" resultType="com.by4cloud.platformx.device.entity.vo.ReceivingNotePageVo">
select
rn.id,
+ rn.note_name,
rn.resource_type ,
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.noteName != null and queryDTO.noteName !=''">
+ and rn.note_name like CONCAT('%', #{queryDTO.noteName}, '%')
+ </if>
+ <if test="queryDTO.contractName != null and queryDTO.contractName !=''">
+ and c.name like CONCAT('%', #{queryDTO.contractName}, '%')
+ </if>
order by
rn.create_time
desc
--
Gitblit v1.9.1