From ed32b4831acf1612d23015d85ff4a14db7f9f77d Mon Sep 17 00:00:00 2001
From: Houjie <714924425@qq.com>
Date: 星期三, 16 七月 2025 15:07:54 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/xml/MdcDeviceCalendarMapper.xml | 12 ++++++++++++
1 files changed, 12 insertions(+), 0 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 77de9af..6a94588 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
@@ -152,4 +152,16 @@
t1.effective_date ASC
</select>
+ <select id="findShiftByEquId" resultType="org.jeecg.modules.mdc.entity.MdcShiftSub">
+ SELECT
+ t3.*
+ 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
+ WHERE
+ t1.equipment_id = #{equipmentId}
+ AND t1.effective_date = #{date}
+ </select>
+
</mapper>
\ No newline at end of file
--
Gitblit v1.9.3