From 286e7ec66098f4f7deeae806781d6faab5ad0d21 Mon Sep 17 00:00:00 2001
From: kongdeqiang <123456>
Date: 星期三, 02 四月 2025 17:24:32 +0800
Subject: [PATCH] fix: 租赁计划修改page方法
---
platformx-device-biz/src/main/resources/mapper/ReceivingNoteMapper.xml | 23 ++++++++++++++++++++---
1 files changed, 20 insertions(+), 3 deletions(-)
diff --git a/platformx-device-biz/src/main/resources/mapper/ReceivingNoteMapper.xml b/platformx-device-biz/src/main/resources/mapper/ReceivingNoteMapper.xml
index 88e1e79..1a883c5 100644
--- a/platformx-device-biz/src/main/resources/mapper/ReceivingNoteMapper.xml
+++ b/platformx-device-biz/src/main/resources/mapper/ReceivingNoteMapper.xml
@@ -21,17 +21,34 @@
<select id="pageNew" resultType="com.by4cloud.platformx.device.entity.vo.ReceivingNotePageVo">
select
rn.id,
- rn.release_comp_name ,
- rn.release_person,
+ rn.note_name,
+ rn.resource_type ,
+ rn.release_date ,
rn.release_code,
+ dm.manufacturer_name,
+ sd.name deptName,
c.name contractName
from
receiving_note rn
- join contract c on rn.contract_id = c.id
+ 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
</select>
</mapper>
--
Gitblit v1.9.1