From a6b14eb86fe8a8799dc5a80246de2b91ecf56141 Mon Sep 17 00:00:00 2001 From: "MSI\\derek" Date: Mon, 3 Feb 2025 15:13:40 +0800 Subject: [PATCH] update active project total --- .../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 6382dd0..e8bfd48 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 @@ -4007,7 +4007,7 @@ open class DashboardService( + " where p.status = 'On-going' " + " and p.deleted = false " + (if (args.containsKey("teamId")) "and s.teamId = :teamId" else "") - + (if (args.containsKey("endDate")) " and coalesce(p.planStart, p.actualStart) <= :endDate" else "") + + (if (args.containsKey("endDate")) " and coalesce(p.actualStart, p.planStart) <= :endDate" else "") + " order by p.code " + " ) result ") println(sql)