From adf58ddc0337678c2a6770fe8687e54a44998c0d Mon Sep 17 00:00:00 2001
From: kongdeqiang <123456>
Date: 星期三, 02 四月 2025 15:43:12 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
platformx-device-biz/src/main/resources/mapper/DeviceTechnicalAgreementMapper.xml | 6 +++---
1 files changed, 3 insertions(+), 3 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..bd7e9db 100644
--- a/platformx-device-biz/src/main/resources/mapper/DeviceTechnicalAgreementMapper.xml
+++ b/platformx-device-biz/src/main/resources/mapper/DeviceTechnicalAgreementMapper.xml
@@ -29,16 +29,15 @@
<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'
@@ -48,6 +47,7 @@
<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