From 2260148a2c4b03366ab3234118f7a2c686690cf9 Mon Sep 17 00:00:00 2001
From: zhangherong <571457620@qq.com>
Date: 星期三, 16 七月 2025 17:42:50 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/xml/MdcEquipmentOvertimeMapper.xml | 8 +++-----
1 files changed, 3 insertions(+), 5 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 b8606e1..3056797 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
@@ -81,12 +81,10 @@
<!--鏌ヨ鍔犵彮鏃堕暱-->
<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
+ mdc_equipment_overtime
WHERE
- mdc.effective_date LIKE CONCAT(#{ validDate }, '%')
- AND mdc.equipment_id = #{ equipmentId }
+ the_date LIKE CONCAT(#{ validDate }, '%') AND equipment_id = #{ equipmentId }
</select>
</mapper>
\ No newline at end of file
--
Gitblit v1.9.3