From 7c8979e4fc7ab777b9a003ef99408693ef69f137 Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期四, 29 八月 2024 16:26:11 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ycl-server/src/main/resources/mapper/zgyw/WorkOrderMapper.xml | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/ycl-server/src/main/resources/mapper/zgyw/WorkOrderMapper.xml b/ycl-server/src/main/resources/mapper/zgyw/WorkOrderMapper.xml
index 18827a0..d090669 100644
--- a/ycl-server/src/main/resources/mapper/zgyw/WorkOrderMapper.xml
+++ b/ycl-server/src/main/resources/mapper/zgyw/WorkOrderMapper.xml
@@ -215,12 +215,12 @@
<select id="hasErrorWorkOrderList" resultType="com.ycl.platform.domain.vo.DeviceInfoVO">
SELECT
wo.id as workOrderId,
- we.device_id,
- wec.channel_id
+ wo.work_order_no as workOrderNo,
+ wo.serial_number as deviceId
FROM
t_work_order wo
- INNER JOIN wvp2.wvp_device we ON we.device_id = wo.serial_number
- INNER JOIN wvp2.wvp_device_channel wec ON we.device_id = wec.device_id
+ WHERE
+ deleted = 0
</select>
<insert id="addMany">
--
Gitblit v1.8.0