From 6d0410c352afeceed069f8eb5f5b6b074fdc4814 Mon Sep 17 00:00:00 2001 From: shiyunteng <shiyunteng@example.com> Date: 星期一, 31 三月 2025 16:44:40 +0800 Subject: [PATCH] 设备维保 设备租赁先 --- platformx-device-biz/src/main/resources/mapper/ReceivingNoteMapper.xml | 8 +++++++- 1 files changed, 7 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..e75ca39 100644 --- a/platformx-device-biz/src/main/resources/mapper/ReceivingNoteMapper.xml +++ b/platformx-device-biz/src/main/resources/mapper/ReceivingNoteMapper.xml @@ -25,18 +25,24 @@ 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 -- Gitblit v1.9.1