From 407e934e050ae55f0ac6a4c8afc1c3933e482493 Mon Sep 17 00:00:00 2001 From: "Mac\\David" Date: Sun, 14 Jul 2024 21:51:27 +0800 Subject: [PATCH] update api --- .../java/com/ffii/tsms/modules/data/service/DashboardService.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/com/ffii/tsms/modules/data/service/DashboardService.kt b/src/main/java/com/ffii/tsms/modules/data/service/DashboardService.kt index 681013c..f50aeec 100644 --- a/src/main/java/com/ffii/tsms/modules/data/service/DashboardService.kt +++ b/src/main/java/com/ffii/tsms/modules/data/service/DashboardService.kt @@ -1796,7 +1796,7 @@ open class DashboardService( + " WHERE" + " DATE(:startdate + INTERVAL numbers.num DAY) BETWEEN" + " :startdate AND" - + " LAST_DAY(:startdate)" + + " CURDATE()" + " AND DAYOFWEEK(DATE(:startdate + INTERVAL numbers.num DAY)) BETWEEN 2 AND 6" + " AND DATE(:startdate + INTERVAL numbers.num DAY) not in (select ch.date from company_holiday ch where ch.deleted = 0)" + " AND DATE(:startdate + INTERVAL numbers.num DAY) not in (:publicHolidayList)"