From be3aa0812cb43be7484e162b4fece5344e9eb5c8 Mon Sep 17 00:00:00 2001
From: qushaowei <qushaowei@163.com>
Date: 星期四, 14 三月 2024 11:12:43 +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 | 16 +++++++++-------
1 files changed, 9 insertions(+), 7 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 6131c89..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
@@ -93,18 +93,17 @@
WHERE
effective_date LIKE CONCAT(#{ validDate }, '%')
AND equipment_id = #{ equipmentId }
- AND shift_sub_id = #{ shiftSubId }
</select>
<!--鏌ヨ鐝鍒嗙被-->
<select id="findShiftSort" resultType="java.lang.String">
- SELECT
- DISTINCT shift_sub_id
+ SELECT DISTINCT
+ t2.shift_name
FROM
- mdc_device_calendar
+ mdc_device_calendar t1 LEFT JOIN mdc_shift t2 ON t1.shift_id = t2.id
WHERE
- effective_date LIKE CONCAT(#{ validDate }, '%')
- AND equipment_id = #{ equipmentId }
+ t1.effective_date LIKE CONCAT(#{ validDate }, '%')
+ AND t1.equipment_id = #{ equipmentId }
</select>
<!--鏌ヨ鐝鏁伴噺-->
@@ -116,7 +115,10 @@
WHERE
effective_date LIKE CONCAT(#{ validDate }, '%')
AND equipment_id = #{ equipmentId }
- AND shift_sub_id = #{ shiftSubId }
+ </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