From 09943dbde1e1aba5a51284828f10b6bbf2772ae5 Mon Sep 17 00:00:00 2001
From: lius <Lius2225@163.com>
Date: 星期二, 26 九月 2023 13:26:03 +0800
Subject: [PATCH] 维修休班管理开放今日数据未计算之前可维护权限

---
 lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/xml/MdcDeviceCalendarMapper.xml |   24 +++++++++++-------------
 1 files changed, 11 insertions(+), 13 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..2528e52 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
@@ -13,19 +13,18 @@
             t3.sleep_start_date,
             t3.sleep_end_date,
             t3.is_day_span,
-            t4.equipment_name,
-            t4.equipment_id
+            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.equment_id = t4.equipment_id
+            LEFT JOIN mdc_equipment t4 ON t1.equipment_id = t4.equipment_id
         WHERE 1=1
         <if test="deviceCalendar.effectiveDate != null and deviceCalendar.effectiveDate != ''">
             AND t1.effective_date LIKE CONCAT('%',#{ deviceCalendar.effectiveDate },'%')
         </if>
         <if test="deviceCalendar.equipmentId != null and deviceCalendar.equipmentId != ''">
-            AND t1.equment_id = #{ deviceCalendar.equipmentId }
+            AND t1.equipment_id = #{ deviceCalendar.equipmentId }
         </if>
         <if test="deviceCalendar.startTime != null and deviceCalendar.startTime != ''">
             AND t1.effective_date &gt;= #{ deviceCalendar.startTime }
@@ -34,7 +33,7 @@
             AND t1.effective_date &lt;= #{ deviceCalendar.endTime }
         </if>
         <if test="deviceCalendar.equipmentIdList != null and deviceCalendar.equipmentIdList.size() > 0 ">
-            AND t1.equment_id IN
+            AND t1.equipment_id IN
             <foreach collection="deviceCalendar.equipmentIdList" item="id" index="index" open="(" close=")" separator=",">
                 #{ id }
             </foreach>
@@ -53,16 +52,15 @@
             t3.sleep_start_date,
             t3.sleep_end_date,
             t3.is_day_span,
-            t4.equipment_name,
-            t4.equipment_id
+            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.equment_id = t4.equipment_id
+            LEFT JOIN mdc_equipment t4 ON t1.equipment_id = t4.equipment_id
         <where>
-            <if test="equipmentid != null and equipmentid != ''">
-                AND t4.equment_id = #{ equipmentid }
+            <if test="equipmentId != null and equipmentId != ''">
+                AND t4.equipment_id = #{ equipmentId }
             </if>
             <if test="stringDate != null and stringDate != ''">
                 AND t1.effective_date = #{ stringDate }
@@ -72,8 +70,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 +80,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