From f7c52006b4e22afe1cbef213dcb0d403d4eb0f66 Mon Sep 17 00:00:00 2001
From: "MSI\\derek" <abc@gmail.com>
Date: Wed, 2 Oct 2024 18:11:49 +0800
Subject: [PATCH] update dashboard

---
 .../ffii/tsms/modules/data/service/DashboardService.kt   | 9 ++++++---
 1 file changed, 6 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 b429a19..697b763 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
@@ -1687,7 +1687,8 @@ open class DashboardService(
                 + " 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,"
-                + " coalesce ((sum(p.expectedTotalFee) - sum(ifnull(p.subContractFee, 0)))*0.8 - expenditure.expenditure,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"
                 + " from project p"
@@ -1888,8 +1889,10 @@ open class DashboardService(
                         + " END AS remarks "
                         + " FROM ( "
                         + " SELECT "
-                        + " DATE_FORMAT(pe.receiptDate, '%Y-%m') AS parsed_date, "
-                        + " DATE_FORMAT(pe.receiptDate, '%m/%y') AS formatted_date, "
+//                        + " DATE_FORMAT(pe.receiptDate, '%Y-%m') AS parsed_date, "
+//                        + " DATE_FORMAT(pe.receiptDate, '%m/%y') AS formatted_date, "
+                        + " DATE_FORMAT(pe.issueDate, '%m/%y') AS parsed_date, "
+                        + " DATE_FORMAT(pe.issueDate, '%m/%y') AS formatted_date, "
                         + " NULL AS income, "
                         + " NULL AS expenditure, "
                         + " SUM(pe.amount) AS expense, "