From 14fbcd6bf88c047bf9b5685cdf8fb06ccf08eb49 Mon Sep 17 00:00:00 2001
From: shiyunteng <shiyunteng@example.com>
Date: 星期四, 10 四月 2025 14:37:35 +0800
Subject: [PATCH] 设备技术协议和设备流水搜索条件
---
platformx-device-biz/src/main/resources/mapper/DeviceTechnicalAgreementMapper.xml | 10 +++++-----
1 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/platformx-device-biz/src/main/resources/mapper/DeviceTechnicalAgreementMapper.xml b/platformx-device-biz/src/main/resources/mapper/DeviceTechnicalAgreementMapper.xml
index c7df52c..1092176 100644
--- a/platformx-device-biz/src/main/resources/mapper/DeviceTechnicalAgreementMapper.xml
+++ b/platformx-device-biz/src/main/resources/mapper/DeviceTechnicalAgreementMapper.xml
@@ -29,25 +29,25 @@
<select id="page" resultType="com.by4cloud.platformx.device.entity.vo.DeviceTechnicalAgreementPageVo">
select
dta.id,
- c.name contractName,
+ dta.agreement_name,
dta.partya ,
dta.partyb ,
dta.partyc ,
dta.sign_date ,
d.name deviceName,
- d.`number` deviceCode
+ dta.device_code
from
device_technical_agreement dta
- join contract c on dta.contract_id = c.id
join device d on d.id = dta.device_id
where
dta.del_flag = '0'
- <if test="queryDTO.contractName != null and queryDTO.contractName !=''">
- and c.name like CONCAT('%', #{queryDTO.contractName}, '%')
+ <if test="queryDTO.agreementName != null and queryDTO.agreementName !=''">
+ and dta.agreement_name like CONCAT('%', #{queryDTO.agreementName}, '%')
</if>
<if test="queryDTO.deviceName != null and queryDTO.deviceName !=''">
and d.name like CONCAT('%', #{queryDTO.deviceName}, '%')
</if>
+ order by dta.create_time desc
</select>
</mapper>
\ No newline at end of file
--
Gitblit v1.9.1