update

lius

2023-08-01 eb8d60871255fb335dcfa3175c5368023b69b727

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

@@ -62,7 +62,7 @@
            LEFT JOIN mdc_equipment t4 ON t1.equment_id = t4.equipment_id
        <where>
            <if test="equipmentid != null and equipmentid != ''">
                AND t4.equment_id = #{ equipmentid }
                AND t4.equipment_id = #{ equipmentid }
            </if>
            <if test="stringDate != null and stringDate != ''">
                AND t1.effective_date = #{ stringDate }
@@ -72,8 +72,8 @@

    <select id="findAcquiesceShift" resultType="org.jeecg.modules.mdc.vo.MdcDeviceCalendarVo">
        SELECT
            t1.shift_id shiftId,
            t2.shift_sub_id shiftSubId,
            t1.id shiftId,
            t2.id shiftSubId,
            t1.shift_name shiftName,
            t2.shift_sub_name shiftSubName,
            t2.start_date startDate,
@@ -82,7 +82,7 @@
            t2.sleep_end_date sleepEndDate,
            t2.is_day_span isDaySpan
        FROM
            mdc_shift t1 LEFT JOIN mdc_shift_sub t2 ON t1.shift_sub_id = t2.id
            mdc_shift t1 LEFT JOIN mdc_shift_sub t2 ON t2.shift_id = t1.id
        WHERE t1.default_shift = 'true'
    </select>