Merge remote-tracking branch 'origin/master'

zss

2024-08-06 80ea05da0c43c2ae14e2d8cf8d284d96d9a8f1f5

 performance-server/src/main/java/com/yuanchu/mom/service/PerformanceShiftService.java

@@ -20,7 +20,13 @@

    void performanceShiftAdd(PerformanceShiftAddDto performanceShiftAddDto);

    IPage<Map<String, Object>> performanceShiftPage(Page<Object> page, String time, String userName, String laboratory);
    Map<String, Object> performanceShiftPage(Page<Object> page, String time, String userName, String laboratory);

    void performanceShiftUpdate(String shift, Integer id);
    void performanceShiftUpdate(PerformanceShift performanceShift);

    IPage<Map<String, Object>> performanceShiftPageYear(Page<Object> page, String time, String userName, String laboratory);

    Map<Object, Object> exportToYearExcel(String time, String userName, String laboratory) throws Exception;

    Map<Object, Object> exportToMonthExcel(String time, String userName, String laboratory);
}