Merge remote-tracking branch 'origin/master'

zhangherong

10 天以前 b63d81722fa0fc56f3f6da7ccf8a294f15b8253a

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

@@ -23,9 +23,14 @@

    List<MdcDeviceCalendarVo> findAcquiesceShift();

    List<String> computeActualWorkDayCount(@Param("shiftSubId") String shiftSubId, @Param("equipmentId") String equipmentId, @Param("validDate") String validDate);
    List<String> computeActualWorkDayCount(@Param("equipmentId") String equipmentId, @Param("validDate") String validDate);

    List<String> findShiftSort(@Param("equipmentId") String equipmentId, @Param("validDate") String validDate);

    Integer computeShiftTimeCount(@Param("shiftSubId") String shiftSubId, @Param("equipmentId") String equipmentId, @Param("validDate") String validDate);
    Integer computeShiftTimeCount(@Param("equipmentId") String equipmentId, @Param("validDate") String validDate);

    MdcDeviceCalendar getFirstData(@Param("equipmentId") String equipmentId);

    List<MdcDeviceCalendarVo> listByEquipmentAndDates(@Param("equipmentId") String equipmentId, @Param("stringDates") List<String> stringDates);

}