From 06b182905fcb8ea1931f8a6dd69fd6ef2d4928b8 Mon Sep 17 00:00:00 2001
From: shiyunteng <shiyunteng@example.com>
Date: 星期五, 28 三月 2025 15:52:18 +0800
Subject: [PATCH] 合同明细中序列号唯一性判断 台账中业务判断
---
platformx-device-biz/src/main/resources/mapper/ReceivingNoteMapper.xml | 16 ++++++++++------
1 files changed, 10 insertions(+), 6 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..2ad25b2 100644
--- a/platformx-device-biz/src/main/resources/mapper/ReceivingNoteMapper.xml
+++ b/platformx-device-biz/src/main/resources/mapper/ReceivingNoteMapper.xml
@@ -21,17 +21,21 @@
<select id="pageNew" resultType="com.by4cloud.platformx.device.entity.vo.ReceivingNotePageVo">
select
rn.id,
- rn.release_comp_name ,
- rn.release_person,
+ rn.resource_type ,
+ rn.release_date ,
rn.release_code,
- c.name contractName
+ dm.manufacturer_name,
+ sd.name deptName
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
where
rn.del_flag = '0'
- <if test="queryDTO.contractName != null and queryDTO.contractName !=''">
- and c.name like CONCAT('%', #{queryDTO.contractName}, '%')
+ <if test="queryDTO.releaseCode != null and queryDTO.releaseCode !=''">
+ and rn.release_code like CONCAT('%', #{queryDTO.releaseCode}, '%')
</if>
</select>
</mapper>
--
Gitblit v1.9.1