From eb8d60871255fb335dcfa3175c5368023b69b727 Mon Sep 17 00:00:00 2001
From: lius <Lius2225@163.com>
Date: 星期二, 01 八月 2023 10:41:30 +0800
Subject: [PATCH] update
---
lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/xml/MdcDeviceCalendarMapper.xml | 8 ++++----
1 files changed, 4 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 6ffa4dd..5bd9aa1 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
@@ -62,7 +62,7 @@
LEFT JOIN mdc_equipment t4 ON t1.equment_id = t4.equipment_id
<where>
<if test="equipmentid != null and equipmentid != ''">
- AND t4.equment_id = #{ equipmentid }
+ AND t4.equipment_id = #{ equipmentid }
</if>
<if test="stringDate != null and stringDate != ''">
AND t1.effective_date = #{ stringDate }
@@ -72,8 +72,8 @@
<select id="findAcquiesceShift" resultType="org.jeecg.modules.mdc.vo.MdcDeviceCalendarVo">
SELECT
- t1.shift_id shiftId,
- t2.shift_sub_id shiftSubId,
+ t1.id shiftId,
+ t2.id shiftSubId,
t1.shift_name shiftName,
t2.shift_sub_name shiftSubName,
t2.start_date startDate,
@@ -82,7 +82,7 @@
t2.sleep_end_date sleepEndDate,
t2.is_day_span isDaySpan
FROM
- mdc_shift t1 LEFT JOIN mdc_shift_sub t2 ON t1.shift_sub_id = t2.id
+ mdc_shift t1 LEFT JOIN mdc_shift_sub t2 ON t2.shift_id = t1.id
WHERE t1.default_shift = 'true'
</select>
--
Gitblit v1.9.3