From 1a2258c4eca2e7514b6096004fa1c3e0036b402b Mon Sep 17 00:00:00 2001
From: qushaowei <qushaowei@163.com>
Date: 星期四, 28 三月 2024 14:04:24 +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 |   89 ++++++++++++++++++++++++++++++++++++++++++--
 1 files changed, 84 insertions(+), 5 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 4e7d0b7..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
@@ -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>
@@ -42,4 +41,84 @@
         ORDER BY t4.equipment_name ASC, t1.EFFECTIVE_DATE ASC
     </select>
 
+
+    <select id="listByEquipmentAndDate" resultType="org.jeecg.modules.mdc.vo.MdcDeviceCalendarVo">
+        SELECT
+            t1.*,
+            t2.shift_name,
+            t3.shift_sub_name,
+            t3.start_date,
+            t3.end_date,
+            t3.sleep_start_date,
+            t3.sleep_end_date,
+            t3.is_day_span,
+            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
+        <where>
+            <if test="equipmentId != null and equipmentId != ''">
+                AND t4.equipment_id = #{ equipmentId }
+            </if>
+            <if test="stringDate != null and stringDate != ''">
+                AND t1.effective_date = #{ stringDate }
+            </if>
+        </where>
+    </select>
+
+    <select id="findAcquiesceShift" resultType="org.jeecg.modules.mdc.vo.MdcDeviceCalendarVo">
+        SELECT
+            t1.id shiftId,
+            t2.id shiftSubId,
+            t1.shift_name shiftName,
+            t2.shift_sub_name shiftSubName,
+            t2.start_date startDate,
+            t2.end_date endDate,
+            t2.sleep_start_date sleepStartDate,
+            t2.sleep_end_date sleepEndDate,
+            t2.is_day_span isDaySpan
+        FROM
+            mdc_shift t1 LEFT JOIN mdc_shift_sub t2 ON t2.shift_id = t1.id
+        WHERE t1.default_shift = 'true'
+    </select>
+
+    <!--璁＄畻瀹為檯鐝骇澶╂暟-->
+    <select id="computeActualWorkDayCount" resultType="java.lang.String">
+        SELECT DISTINCT
+            effective_date
+        FROM
+            mdc_device_calendar
+        WHERE
+            effective_date LIKE CONCAT(#{ validDate }, '%')
+            AND equipment_id = #{ equipmentId }
+    </select>
+
+    <!--鏌ヨ鐝鍒嗙被-->
+    <select id="findShiftSort" resultType="java.lang.String">
+        SELECT DISTINCT
+            t2.shift_name
+        FROM
+            mdc_device_calendar t1 LEFT JOIN mdc_shift t2 ON t1.shift_id = t2.id
+        WHERE
+            t1.effective_date LIKE CONCAT(#{ validDate }, '%')
+            AND t1.equipment_id = #{ equipmentId }
+    </select>
+
+    <!--鏌ヨ鐝鏁伴噺-->
+    <select id="computeShiftTimeCount" resultType="java.lang.Integer">
+        SELECT
+            COUNT(*)
+        FROM
+            mdc_device_calendar
+        WHERE
+            effective_date LIKE CONCAT(#{ validDate }, '%')
+            AND equipment_id = #{ equipmentId }
+    </select>
+
+    <select id="getFirstData" resultType="org.jeecg.modules.mdc.entity.MdcDeviceCalendar">
+        SELECT TOP 1 * FROM mdc_device_calendar WHERE equipment_id = #{ equipmentId } ORDER BY effective_date ASC
+    </select>
+
 </mapper>
\ No newline at end of file

--
Gitblit v1.9.3