From 7f11e541f239d8c816bcefb32aae6b9efa31e28e Mon Sep 17 00:00:00 2001
From: qushaowei <qushaowei@163.com>
Date: 星期三, 13 十二月 2023 16:49:15 +0800
Subject: [PATCH] 生产线点检
---
lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/xml/MdcDeviceCalendarMapper.xml | 40 ++++++++++++++++++++++++++++++++++++----
1 files changed, 36 insertions(+), 4 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 39b812f..b2af396 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
@@ -52,16 +52,15 @@
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.equipment_id = t4.equipment_id
<where>
- <if test="equipmentid != null and equipmentid != ''">
- AND t4.equipment_id = #{ equipmentid }
+ <if test="equipmentId != null and equipmentId != ''">
+ AND t4.equipment_id = #{ equipmentId }
</if>
<if test="stringDate != null and stringDate != ''">
AND t1.effective_date = #{ stringDate }
@@ -85,4 +84,37 @@
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>
+
</mapper>
\ No newline at end of file
--
Gitblit v1.9.3