Merge branch 'master' of http://117.34.109.166:18448/r/mdc_430 into develop

qushaowei

2023-11-07 094a9290c836827bc1f45fd3549e7cd2ea1e1e45

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

@@ -77,4 +77,17 @@
        </where>
        order by t2.effective_date asc
    </select>

    <!--查询加班时长-->
    <select id="computeOvertime" resultType="org.jeecg.modules.mdc.entity.MdcEquipmentOvertime">
        SELECT
            meo.*
        FROM
            mdc_equipment_overtime meo
            LEFT JOIN mdc_device_calendar mdc ON meo.calendar_id = mdc.id
        WHERE
            mdc.effective_date LIKE CONCAT(#{ validDate }, '%')
            AND mdc.equipment_id = #{ equipmentId }
            AND mdc.shift_sub_id = #{ shiftSubId }
    </select>
</mapper>