From a6d22f16447c4b440b269fa8b43daf919e5a10c4 Mon Sep 17 00:00:00 2001
From: Lius <Lius2225@163.com>
Date: 星期四, 12 十月 2023 10:11:25 +0800
Subject: [PATCH] update
---
lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/xml/MdcEquipmentOvertimeMapper.xml | 45 ++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 44 insertions(+), 1 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 edaf5e6..65a66dd 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,6 +5,7 @@
<!--鍒嗛〉鏌ヨ-->
<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,
@@ -12,7 +13,49 @@
t3.end_date endDate,
t1.start_time startTime,
t1.end_time endTime,
- t1.remark remark
+ t1.remark remark,
+ t1.create_by createBy,
+ t1.create_time createTime,
+ t1.update_by updateBy,
+ t1.update_time updateTime
+ FROM
+ 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.equipmentName != null and mdcEquipmentOvertime.equipmentName != '' ">
+ AND t4.equipment_name LIKE CONCAT(CONCAT('%',#{mdcEquipmentOvertime.equipmentName}),'%')
+ </if>
+ <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 t2.equipment_id IN
+ <foreach collection="mdcEquipmentOvertime.mdcSectionIds" item="id" index="index" open="(" close=")" separator=",">
+ #{ id }
+ </foreach>
+ </if>
+ </where>
+ order by t2.effective_date asc
+ </select>
+
+ <!--list鍒楄〃-->
+ <select id="list" 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 t1
LEFT JOIN mdc_device_calendar t2 ON t1.calendar_id = t2.id
--
Gitblit v1.9.3