From ef42241da864123563a116308a8d6eda4aa8b71f Mon Sep 17 00:00:00 2001 From: "MSI\\derek" Date: Tue, 22 Oct 2024 15:35:25 +0800 Subject: [PATCH] update --- .../com/ffii/tsms/modules/data/service/DashboardService.kt | 4 ++-- 1 file changed, 2 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 f1d7ef2..a209833 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 @@ -3476,8 +3476,8 @@ open class DashboardService( + " left join project p on p.code = i.projectCode " + " left join staff s on s.id = p.teamlead " + " where i.deleted = false " - + (if (args.containsKey("startDate") && args.containsKey("endDate")) " and i.receiptDate between :startDate AND :endDate " - else if (args.containsKey("endDate")) " and i.receiptDate <= :endDate " + + (if (args.containsKey("startDate") && args.containsKey("endDate")) " and i.invoiceDate between :startDate AND :endDate " + else if (args.containsKey("endDate")) " and i.invoiceDate <= :endDate " else "") + " group by p.id " + " ) "