车间管理添加字段，算法bug修复

Lius

2024-03-13 e8d223967ea612f4eb24603ed7ae941ec00fd76f

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

@@ -13,19 +13,18 @@
            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.equment_id = t4.equipment_id
            LEFT JOIN mdc_equipment t4 ON t1.equipment_id = t4.equipment_id
        WHERE 1=1
        <if test="deviceCalendar.effectiveDate != null and deviceCalendar.effectiveDate != ''">
            AND t1.effective_date LIKE CONCAT('%',#{ deviceCalendar.effectiveDate },'%')
        </if>
        <if test="deviceCalendar.equipmentId != null and deviceCalendar.equipmentId != ''">
            AND t1.equment_id = #{ deviceCalendar.equipmentId }
            AND t1.equipment_id = #{ deviceCalendar.equipmentId }
        </if>
        <if test="deviceCalendar.startTime != null and deviceCalendar.startTime != ''">
            AND t1.effective_date &gt;= #{ deviceCalendar.startTime }
@@ -34,7 +33,7 @@
            AND t1.effective_date &lt;= #{ deviceCalendar.endTime }
        </if>
        <if test="deviceCalendar.equipmentIdList != null and deviceCalendar.equipmentIdList.size() > 0 ">
            AND t1.equment_id IN
            AND t1.equipment_id IN
            <foreach collection="deviceCalendar.equipmentIdList" item="id" index="index" open="(" close=")" separator=",">
                #{ id }
            </foreach>
@@ -53,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.equment_id = t4.equipment_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 }
@@ -86,4 +84,41 @@
        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>

    <select id="getFirstData" resultType="org.jeecg.modules.mdc.entity.MdcDeviceCalendar">
        SELECT TOP 1 * FROM mdc_device_calendar WHERE equipment_id = #{ equipmentId } ORDER BY effective_date ASC
    </select>

</mapper>