Merge remote-tracking branch 'origin/master' into develop

zenglf

2023-09-28 f84d9e69907cb678150eaa6393fd74cf042fcca4

 lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/xml/MdcEfficiencyReportMapper.xml

@@ -81,13 +81,14 @@
            SUM ( t1.process_long ) processLong,
            SUM ( t1.open_long ) openLong,
            SUM ( t1.wait_long ) waitLong,
            SUM ( t1.close_long ) closeLong
            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 &lt;= #{ endTime }
            AND t1.the_date &gt;= #{ startTime }
            AND t1.the_date &lt;= #{ vo.endTime }
            AND t1.the_date &gt;= #{ 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=",">
@@ -111,4 +112,31 @@
        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>