From 094a9290c836827bc1f45fd3549e7cd2ea1e1e45 Mon Sep 17 00:00:00 2001
From: qushaowei <qushaowei@163.com>
Date: 星期二, 07 十一月 2023 09:45:36 +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/MdcEquipmentOvertimeMapper.xml | 13 +++++++++++++
1 files changed, 13 insertions(+), 0 deletions(-)
diff --git a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/xml/MdcEquipmentOvertimeMapper.xml b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/xml/MdcEquipmentOvertimeMapper.xml
index 65a66dd..686c7f3 100644
--- a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/xml/MdcEquipmentOvertimeMapper.xml
+++ b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/xml/MdcEquipmentOvertimeMapper.xml
@@ -77,4 +77,17 @@
</where>
order by t2.effective_date asc
</select>
+
+ <!--鏌ヨ鍔犵彮鏃堕暱-->
+ <select id="computeOvertime" resultType="org.jeecg.modules.mdc.entity.MdcEquipmentOvertime">
+ SELECT
+ meo.*
+ FROM
+ mdc_equipment_overtime meo
+ LEFT JOIN mdc_device_calendar mdc ON meo.calendar_id = mdc.id
+ WHERE
+ mdc.effective_date LIKE CONCAT(#{ validDate }, '%')
+ AND mdc.equipment_id = #{ equipmentId }
+ AND mdc.shift_sub_id = #{ shiftSubId }
+ </select>
</mapper>
\ No newline at end of file
--
Gitblit v1.9.3