From f84d9e69907cb678150eaa6393fd74cf042fcca4 Mon Sep 17 00:00:00 2001
From: zenglf <18502938215@163.com>
Date: 星期四, 28 九月 2023 14:39:03 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master' into develop
---
lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/xml/MdcEfficiencyReportMapper.xml | 71 +++++++++++++++++++++++++++++++++++
1 files changed, 71 insertions(+), 0 deletions(-)
diff --git a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/xml/MdcEfficiencyReportMapper.xml b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/xml/MdcEfficiencyReportMapper.xml
index d5d3516..78901bf 100644
--- a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/xml/MdcEfficiencyReportMapper.xml
+++ b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/xml/MdcEfficiencyReportMapper.xml
@@ -68,4 +68,75 @@
</if>
ORDER BY t1.the_date
</select>
+
+ <!--寰楀埌鎵�鏈夌彮娆℃暟鎹箣鍜�-->
+ <select id="efficiencyShiftSumList" resultType="org.jeecg.modules.mdc.entity.MdcEquipmentStatisticalShiftInfo">
+ SELECT
+ t2.equipment_id equipmentId,
+ t2.equipment_name equipmentName,
+ t2.equipment_type equipmentType,
+ t1.the_date theDate,
+ t1.shift_id shiftId,
+ t1.shift_sub_id shiftSubId,
+ SUM ( t1.process_long ) processLong,
+ SUM ( t1.open_long ) openLong,
+ SUM ( t1.wait_long ) waitLong,
+ SUM ( t1.close_long ) closeLong,
+ sum ( t1.total_long ) totalLong
+ FROM
+ mdc_equipment t2
+ LEFT JOIN mdc_equipment_statistical_shift_info t1 ON t1.equipment_id = t2.equipment_id
+ <where>
+ AND t1.the_date <= #{ vo.endTime }
+ AND t1.the_date >= #{ vo.startTime }
+ <if test="vo.equipmentIdList != null and vo.equipmentIdList.size() > 0 ">
+ AND t2.equipment_id IN
+ <foreach collection="vo.equipmentIdList" item="id" index="index" open="(" close=")" separator=",">
+ #{ id }
+ </foreach>
+ </if>
+ <if test="vo.shiftId != null and vo.shiftId != ''">
+ AND t1.shift_id = #{ vo.shiftId }
+ </if>
+ <if test="vo.shiftSubId != null and vo.shiftSubId != ''">
+ AND t1.shift_sub_id = #{ vo.shiftSubId }
+ </if>
+ </where>
+ GROUP BY
+ t2.equipment_id,
+ t2.equipment_name,
+ t2.equipment_type,
+ t1.the_date,
+ t1.shift_id,
+ t1.shift_sub_id
+ ORDER BY
+ t1.the_date
+ </select>
+
+ <!--鏌ヨ鍘熷鏁版嵁-->
+ <select id="comparativeAnalysis" resultType="org.jeecg.modules.mdc.dto.MdcComAnaDto">
+ SELECT
+ mesi.equipment_id equipmentId,
+ SUM ( mesi.open_long ) openLong,
+ SUM ( mesi.close_long ) closeLong,
+ SUM ( mesi.wait_long ) waitLong,
+ SUM ( mesi.process_long ) processLong
+ FROM
+ mdc_equipment_statistical_info mesi
+ LEFT JOIN mdc_equipment me ON mesi.equipment_id = me.equipment_id
+ <where>
+ <if test="vo.equipmentIdList != null and vo.equipmentIdList.size() > 0 ">
+ AND mesi.equipment_id IN
+ <foreach collection="vo.equipmentIdList" item="id" index="index" open="(" close=")" separator=",">
+ #{ id }
+ </foreach>
+ </if>
+ <if test="vo.driveType != null and vo.driveType != null">
+ AND me.drive_type = #{ vo.driveType }
+ </if>
+ AND mesi.the_date BETWEEN #{ vo.startTime } AND #{ vo.endTime }
+ </where>
+ GROUP BY
+ mesi.equipment_id
+ </select>
</mapper>
\ No newline at end of file
--
Gitblit v1.9.3