From 7911497ffa51bd41fc334153b2a456ff02554747 Mon Sep 17 00:00:00 2001
From: shiyunteng <shiyunteng@example.com>
Date: 星期二, 01 四月 2025 15:20:37 +0800
Subject: [PATCH] 整体流程测试修改0401-2
---
platformx-device-biz/src/main/resources/mapper/DeviceRepairMapper.xml | 24 +++++++++++++++++++++++-
1 files changed, 23 insertions(+), 1 deletions(-)
diff --git a/platformx-device-biz/src/main/resources/mapper/DeviceRepairMapper.xml b/platformx-device-biz/src/main/resources/mapper/DeviceRepairMapper.xml
index f85d139..460e9fa 100644
--- a/platformx-device-biz/src/main/resources/mapper/DeviceRepairMapper.xml
+++ b/platformx-device-biz/src/main/resources/mapper/DeviceRepairMapper.xml
@@ -6,7 +6,7 @@
<resultMap id="deviceRepairMap" type="com.by4cloud.platformx.device.entity.DeviceScrap">
<id property="id" column="id"/>
<result property="compId" column="comp_id"/>
- <result property="deviceCoder" column="device_coder"/>
+ <result property="deviceCode" column="device_code"/>
<result property="deviceId" column="device_id"/>
<result property="inventoryId" column="inventory_id"/>
<result property="repairEndDate" column="repair_end_date"/>
@@ -19,4 +19,26 @@
<result property="updateTime" column="update_time"/>
<result property="delFlag" column="del_flag"/>
</resultMap>
+ <select id="pageNew" resultType="com.by4cloud.platformx.device.entity.vo.DeviceRepairPageVo">
+ select
+ dr.id,
+ d.name deviceName,
+ d.`number` deviceCode,
+ dr.serial_no,
+ dr.repair_start_date,
+ dr.repair_end_date,
+ dr.status
+ from
+ device_repair dr
+ join device d on
+ dr.device_id = d.id
+ where
+ dr.del_flag='0'
+ <if test="queryDTO.deviceName != null and queryDTO.deviceName !=''">
+ and d.name like CONCAT('%', #{queryDTO.deviceName}, '%')
+ </if>
+ <if test="queryDTO.serialNo != null and queryDTO.serialNo !=''">
+ and dr.serial_no like CONCAT('%', #{queryDTO.serialNo}, '%')
+ </if>
+ </select>
</mapper>
\ No newline at end of file
--
Gitblit v1.9.1