From 10f3403dfa67f3daa3b08ad9efa11a058238e435 Mon Sep 17 00:00:00 2001 From: "MSI\\derek" Date: Wed, 23 Oct 2024 11:38:11 +0800 Subject: [PATCH] update financial year sql --- .../com/ffii/tsms/modules/data/service/DashboardService.kt | 6 +++--- 1 file changed, 3 insertions(+), 3 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 a209833..5a983b1 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 @@ -3448,8 +3448,8 @@ open class DashboardService( + " select " + " projectId, " + " CASE WHEN tl.teamId = p.teamId " - + " THEN (sum(coalesce(t.normalConsumed, 0)) + sum(coalesce(t.otConsumed, 0)))*max(sal.hourlyRate) " - + " ELSE ((sum(coalesce(t.normalConsumed, 0)) + sum(coalesce(t.otConsumed, 0)))*max(sal.hourlyRate)) * 1 " // cross team multiplier + + " THEN SUM((COALESCE(t.normalConsumed, 0) + COALESCE(t.otConsumed, 0)) * COALESCE(sal.hourlyRate, 0)) " + + " ELSE SUM((COALESCE(t.normalConsumed, 0) + COALESCE(t.otConsumed, 0)) * COALESCE(sal.hourlyRate, 0) * 1) " // cross team multiplier + " END AS manhourExpense " + " from ( " + " SELECT * " @@ -3462,7 +3462,7 @@ open class DashboardService( + " ) t " + " left join p_cte p on p.id = t.projectId " + " left join team_log tl on tl.staffId = t.staffId and t.recordDate between tl.`from` AND tl.`to` " - + " inner JOIN salary_effective se ON se.staffId = t.staffId and t.recordDate between se.startDate AND se.endDate " + + " left JOIN salary_effective se ON se.staffId = t.staffId and t.recordDate between se.startDate AND se.endDate " + " left join salary sal on sal.salaryPoint = se.salaryId " + " GROUP BY t.projectId, tl.teamId, p.teamId " + " ) "