Merge remote-tracking branch 'origin/master'

zhangherong

10 天以前 b63d81722fa0fc56f3f6da7ccf8a294f15b8253a

 lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/IMdcDeviceCalendarService.java

@@ -41,12 +41,11 @@
    /**
     * 计算实际班产天数
     *
     * @param shiftSubId
     * @param equipmentId
     * @param validDate
     * @return
     */
    BigDecimal computeActualWorkDayCount(String shiftSubId, String equipmentId, String validDate);
    BigDecimal computeActualWorkDayCount(String equipmentId, String validDate);

    /**
     * 查询班次分类
@@ -60,10 +59,18 @@
    /**
     * 计算班次时间
     *
     * @param shiftSubId
     * @param equipmentId
     * @param validDate
     * @return
     */
    BigDecimal computeShiftTimeCount(String shiftSubId, String equipmentId, String validDate);
    BigDecimal computeShiftTimeCount(String equipmentId, String validDate);

    /**
     * 生成设备工作日历
     */
    void generateDeviceCalendar();

    MdcDeviceCalendar getFirstData(String equipmentId);

    List<MdcDeviceCalendarVo> listByEquipmentIdAndDate(String equipmentId, String date);
}