From d36ab710dd55e3ab2c163bd5bd5db7aa492e9400 Mon Sep 17 00:00:00 2001 From: "Mac\\David" Date: Mon, 15 Jul 2024 10:32:03 +0800 Subject: [PATCH] unsubmit api --- .../tsms/modules/data/service/DashboardService.kt | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) 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 f50aeec..6c210c4 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 @@ -1717,7 +1717,11 @@ open class DashboardService( + " SELECT 5 as num" + " ) numbers" + " WHERE" - + " DATE(:startdate + INTERVAL numbers.num DAY) BETWEEN :startdate AND DATE_ADD(:startdate, INTERVAL 6 DAY)" + + " DATE(:startdate + INTERVAL numbers.num DAY) BETWEEN :startdate AND" + + " case" + + " when curdate() < DATE_ADD(:startdate, INTERVAL 6 DAY) then curdate()" + + " else DATE_ADD(:startdate, INTERVAL 6 DAY)" + + " end" + " 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)" @@ -1796,7 +1800,10 @@ open class DashboardService( + " WHERE" + " DATE(:startdate + INTERVAL numbers.num DAY) BETWEEN" + " :startdate AND" - + " CURDATE()" + + " case" + + " when month(:startdate) >= month(curdate()) then curdate()" + + " else LAST_DAY(:startdate)" + + " end" + " 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)"