From c16329fad94c7a783aae1fc204b9b9818dcf1d29 Mon Sep 17 00:00:00 2001
From: shiyunteng <shiyunteng@example.com>
Date: 星期一, 31 三月 2025 11:04:48 +0800
Subject: [PATCH] 合同新增添加中标单关联，根据选择的中标单赋值乙方 中标单中标厂家改成下拉 验收单来源类型根据合同类型，查询条件和结果新增合同名称
---
platformx-device-biz/src/main/resources/mapper/ReceivingNoteMapper.xml | 19 ++++++++++++++++---
1 files changed, 16 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..e75ca39 100644
--- a/platformx-device-biz/src/main/resources/mapper/ReceivingNoteMapper.xml
+++ b/platformx-device-biz/src/main/resources/mapper/ReceivingNoteMapper.xml
@@ -21,17 +21,30 @@
<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,
+ 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.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