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/MdcNoplanCloseMapper.xml

@@ -30,4 +30,18 @@
        </where>
        ORDER BY start_time ASC
    </select>


    <select id="findNoplanTimeDuration" resultType="org.jeecg.modules.mdc.entity.MdcNoplanClose">
        SELECT
            *
        FROM
            mdc_noplan_close
        WHERE
            equipment_id = #{ equipmentId }
            AND ( ( start_time BETWEEN #{ startDate } AND #{ endDate } ) OR ( end_time BETWEEN #{ startDate } AND #{ endDate } ) )
            AND noplan_type = #{ noplanType }
        ORDER BY
            start_time ASC
    </select>
</mapper>