From cb71612e56d42a875306393b3b950704fc343f15 Mon Sep 17 00:00:00 2001
From: "MSI\\2Fi" <jason.tom@2fi-solutions.com.hk>
Date: Wed, 19 Mar 2025 14:18:58 +0800
Subject: [PATCH] Update Invoice related report and result

---
 .../com/ffii/tsms/modules/data/service/DashboardService.kt    | 2 ++
 .../com/ffii/tsms/modules/report/service/ReportService.kt     | 4 ++++
 2 files changed, 6 insertions(+)

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 c9af7f8..41fa66a 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
@@ -308,6 +308,7 @@ open class DashboardService(
                     + " from invoice i"
                     + " left join project p on p.code = i.projectCode"
                     + " where i.deleted = 0" //update invoice deletable
+                    + " and p.deleted = false"
                     + " group by p.code"
                     + " )"
                     + " select p.code, p.description, c.name as client, concat(t.code, \' - \', t.name) as teamLead, p.planStart , p.planEnd , p.expectedTotalFee,"
@@ -2017,6 +2018,7 @@ open class DashboardService(
             + "     sum(issueAmount) as income "
             + " from invoice i "
             + " left join project p on p.code = i.projectCode "
+            + " and p.deleted = false "
             + " left join staff s on s.id = p.teamLead "
             + " where i.deleted = false "
             + " and year(i.receiptDate) = :year "
diff --git a/src/main/java/com/ffii/tsms/modules/report/service/ReportService.kt b/src/main/java/com/ffii/tsms/modules/report/service/ReportService.kt
index 87cdf08..99ef0c1 100644
--- a/src/main/java/com/ffii/tsms/modules/report/service/ReportService.kt
+++ b/src/main/java/com/ffii/tsms/modules/report/service/ReportService.kt
@@ -2191,6 +2191,7 @@ open class ReportService(
                     + " from invoice i"
                     + " left join project p on p.code = i.projectCode"
                     + " where i.deleted = false "
+                    + " and p.deleted = false "
                     + " group by p.code"
                     + " ),"
                     + " cte_expense as ( "
@@ -2211,6 +2212,7 @@ open class ReportService(
                     + " left join cte_invoice cte_i on cte_i.code = p.code"
                     + " left join cte_expense cte_e on cte_e.projectId = p.id "
                     + " where p.status = \'On-going\'"
+                    + " and p.deleted = false "
         )
         if (teamLeadId!! > 0) {
             sql.append(" and p.teamLead = :teamLeadId ")
@@ -2567,6 +2569,7 @@ open class ReportService(
                     + " from invoice i"
                     + " left join project p on p.code = i.projectCode"
                     + " where i.deleted = false "
+                    + " and p.deleted = false "
                     + " and (DATE_FORMAT(i.invoiceDate, '%Y-%m') >= :startMonth and DATE_FORMAT(i.invoiceDate, '%Y-%m') <= :endMonth) "
                     + " group by p.code"
                     + " ),"
@@ -2575,6 +2578,7 @@ open class ReportService(
                     + " from invoice i"
                     + " left join project p on p.code = i.projectCode"
                     + " where i.deleted = false "
+                    + " and p.deleted = false "
                     + " and (DATE_FORMAT(i.receiptDate, '%Y-%m') >= :startMonth and DATE_FORMAT(i.receiptDate, '%Y-%m') <= :endMonth) "
                     + " group by p.code"
                     + " ),"