From 32bce94f4d1002fe3bcc9e166c3fb6804be518da Mon Sep 17 00:00:00 2001 From: "MSI\\derek" Date: Wed, 2 Oct 2024 19:11:37 +0800 Subject: [PATCH] update dashboard --- .../com/ffii/tsms/modules/data/service/DashboardService.kt | 5 +++-- 1 file changed, 3 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 697b763..dbb3f1b 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 @@ -1686,8 +1686,9 @@ open class DashboardService( + " coalesce (sum(i.paidAmount),0) as totalReceived," + " coalesce (sum(i.issueAmount) - sum(i.paidAmount),0) as receivable," + " coalesce (round((sum(p.expectedTotalFee) - sum(ifnull(p.subContractFee, 0)))*0.8,2),0) as totalBudget," - + " coalesce (expenditure.expenditure + sum(pc.expense), 0) as totalExpenditure," - + " (sum(p.expectedTotalFee) - sum(ifnull(p.subContractFee, 0)))*0.8 - coalesce(sum(pc.expense), 0) as expenditureReceivable," + + " coalesce(expenditure.expenditure, 0) + + sum(coalesce(pc.expense, 0)) as totalExpenditure," + + " coalesce(round((sum(p.expectedTotalFee) - sum(ifnull(p.subContractFee, 0)))*0.8,2),0) - (coalesce(expenditure.expenditure, 0) + + sum(coalesce(pc.expense, 0))) as expenditureReceivable," +// + " (sum(p.expectedTotalFee) - sum(ifnull(p.subContractFee, 0)))*0.8 - coalesce(sum(pc.expense), 0) as expenditureReceivable," // + " coalesce ((sum(p.expectedTotalFee) - sum(ifnull(p.subContractFee, 0)))*0.8 - expenditure.expenditure,0) as expenditureReceivable," + " sum(p.expectedTotalFee) as totalProjectFee," + " coalesce (round(sum(i.issueAmount)/sum(p.expectedTotalFee)*100,0),0) as invoicedPercentage"