From f06142bf9d9482dcddab67139239ad5728f23aeb Mon Sep 17 00:00:00 2001 From: "MSI\\2Fi" Date: Fri, 4 Oct 2024 17:50:58 +0800 Subject: [PATCH] projectExpense return 0 instead of null --- .../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 2722b9c..904c7fa 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 @@ -785,7 +785,7 @@ open class DashboardService( + " left join (" + " select" + " t4.id as teamId," - + " sum(pe.amount) as amount" + + " COALESCE(sum(pe.amount),0) as amount" + " from team t4" + " left join project p4 on t4.teamLead = p4.teamLead" + " left join project_expense pe on pe.projectId = p4.id" @@ -929,7 +929,7 @@ open class DashboardService( + " ) as expenditure on 1=1." + " left join (" + " select" - + " sum(pe.amount) as amount" + + " COALESCE(sum(pe.amount),0) as amount" + " from project p4" + " left join project_expense pe on pe.projectId = p4.id" + " where p4.status = 'On-going'"