From 233c7122b0fe27b0edc6e987225c1ccf236c5ca9 Mon Sep 17 00:00:00 2001
From: lius <Lius2225@163.com>
Date: 星期五, 01 九月 2023 14:39:00 +0800
Subject: [PATCH] update
---
lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/xml/MdcEquipmentOvertimeMapper.xml | 31 +++++++++++++++++++++++--------
1 files changed, 23 insertions(+), 8 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 d145722..e85447c 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
@@ -5,23 +5,38 @@
<!--鍒嗛〉鏌ヨ-->
<select id="pageList" resultType="org.jeecg.modules.mdc.entity.MdcEquipmentOvertime">
SELECT
- *
+ t1.id
+ t2.equipment_id equipmentId,
+ t4.equipment_name equipmentName,
+ t2.effective_date effectiveDate,
+ t3.start_date startDate,
+ t3.end_date endDate,
+ t1.start_time startTime,
+ t1.end_time endTime,
+ t1.remark remark,
+ t1.create_by createBy,
+ t1.create_time createTime,
+ t1.update_by updateBy,
+ t1.update_time updateTime
FROM
- mdc_equipment_overtime
+ mdc_equipment_overtime t1
+ LEFT JOIN mdc_device_calendar t2 ON t1.calendar_id = t2.id
+ LEFT JOIN mdc_shift_sub t3 ON t3.id = t2.shift_sub_id
+ LEFT JOIN mdc_equipment t4 ON t4.equipment_id = t2.equipment_id
<where>
- <if test="mdcEquipmentOvertime.equipmentId != null and mdcEquipmentOvertime.equipmentId != '' ">
- AND equipment_id LIKE CONCAT(CONCAT('%',#{mdcEquipmentOvertime.equipmentId}),'%')
+ <if test="mdcEquipmentOvertime.equipmentName != null and mdcEquipmentOvertime.equipmentName != '' ">
+ AND t4.equipment_name LIKE CONCAT(CONCAT('%',#{mdcEquipmentOvertime.equipmentName}),'%')
</if>
- <if test="mdcEquipmentOvertime.startTime != null and mdcEquipmentOvertime.endTime != null">
- AND efficient_date BETWEEN #{ mdcEquipmentOvertime.startTime } AND #{ mdcEquipmentOvertime.endTime }
+ <if test="mdcEquipmentOvertime.equipmentId != null and mdcEquipmentOvertime.equipmentId != '' ">
+ AND t2.equipment_id LIKE CONCAT(CONCAT('%',#{mdcEquipmentOvertime.equipmentId}),'%')
</if>
<if test="mdcEquipmentOvertime.mdcSectionIds != null and mdcEquipmentOvertime.mdcSectionIds.size() > 0 ">
- AND equipment_id IN
+ AND t2.equipment_id IN
<foreach collection="mdcEquipmentOvertime.mdcSectionIds" item="id" index="index" open="(" close=")" separator=",">
#{ id }
</foreach>
</if>
</where>
- order by
+ order by t2.effective_date asc
</select>
</mapper>
\ No newline at end of file
--
Gitblit v1.9.3