From be3aa0812cb43be7484e162b4fece5344e9eb5c8 Mon Sep 17 00:00:00 2001
From: qushaowei <qushaowei@163.com>
Date: 星期四, 14 三月 2024 11:12:43 +0800
Subject: [PATCH] Merge branch 'master' of http://117.34.109.166:18448/r/mdc_430 into develop
---
lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/xml/MdcDeviceCalendarMapper.xml | 5 +----
1 files changed, 1 insertions(+), 4 deletions(-)
diff --git a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/xml/MdcDeviceCalendarMapper.xml b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/xml/MdcDeviceCalendarMapper.xml
index a63838e..b47450f 100644
--- a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/xml/MdcDeviceCalendarMapper.xml
+++ b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/xml/MdcDeviceCalendarMapper.xml
@@ -52,15 +52,12 @@
t3.sleep_start_date,
t3.sleep_end_date,
t3.is_day_span,
- t4.equipment_name,
- t5.start_time overtimeStartTime,
- t5.end_time overtimeEndTime
+ t4.equipment_name
FROM
mdc_device_calendar t1
LEFT JOIN mdc_shift t2 ON t1.shift_id = t2.id
LEFT JOIN mdc_shift_sub t3 ON t1.shift_sub_id = t3.id
LEFT JOIN mdc_equipment t4 ON t1.equipment_id = t4.equipment_id
- LEFT JOIN mdc_equipment_overtime t5 ON t5.calendar_id = t1.id
<where>
<if test="equipmentId != null and equipmentId != ''">
AND t4.equipment_id = #{ equipmentId }
--
Gitblit v1.9.3