From b706674184917d14d53c855540a1729176a4c8d0 Mon Sep 17 00:00:00 2001
From: "cyril.tsui" <cyril.tsui@2fi-solutions.com.hk>
Date: Thu, 4 Jul 2024 15:26:58 +0800
Subject: [PATCH] update sub-project & report

---
 .../ffii/tsms/modules/project/service/ProjectsService.kt    | 3 ++-
 .../tsms/modules/project/web/models/MainProjectDetails.kt   | 1 +
 .../com/ffii/tsms/modules/report/service/ReportService.kt   | 6 +++---
 3 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/src/main/java/com/ffii/tsms/modules/project/service/ProjectsService.kt b/src/main/java/com/ffii/tsms/modules/project/service/ProjectsService.kt
index ba83321..712fc72 100644
--- a/src/main/java/com/ffii/tsms/modules/project/service/ProjectsService.kt
+++ b/src/main/java/com/ffii/tsms/modules/project/service/ProjectsService.kt
@@ -463,7 +463,8 @@ open class ProjectsService(
                 clientContactId = subsidiaryContact.find { contact -> contact.name == project.custLeadName }?.id
                     ?: customerContact.find { contact -> contact.name == project.custLeadName }?.id,
                 clientSubsidiaryId = project.customerSubsidiary?.id,
-                expectedProjectFee = project.expectedTotalFee
+                expectedProjectFee = project.expectedTotalFee,
+                subContractFee = project.subContractFee,
             )
         }
     }
diff --git a/src/main/java/com/ffii/tsms/modules/project/web/models/MainProjectDetails.kt b/src/main/java/com/ffii/tsms/modules/project/web/models/MainProjectDetails.kt
index 3c2a748..ba2e4bc 100644
--- a/src/main/java/com/ffii/tsms/modules/project/web/models/MainProjectDetails.kt
+++ b/src/main/java/com/ffii/tsms/modules/project/web/models/MainProjectDetails.kt
@@ -27,4 +27,5 @@ data class MainProjectDetails (
     val clientSubsidiaryId: Long?,
 
     val expectedProjectFee: Double?,
+    val subContractFee: Double?,
 )
\ No newline at end of file
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 6c492fd..558819f 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
@@ -1842,13 +1842,13 @@ open class ReportService(
         val sql = StringBuilder(
             "WITH teamNormalConsumed AS ("
                     + " SELECT"
-                    + " tns.projectId,"
+                    + " tns.project_id,"
                     + " SUM(tns.totalConsumed) AS totalConsumed, "
                     + " sum(tns.totalBudget) as totalBudget "
                     + " FROM ( "
                     + "   SELECT"
                     + "   t.staffId,"
-                    + "   t.projectId AS projectId,"
+                    + "   t.projectId AS project_id,"
                     + "   sum(t.normalConsumed + COALESCE(t.otConsumed, 0)) as totalConsumed, "
                     + "   sum(t.normalConsumed + COALESCE(t.otConsumed, 0)) * min(sal.hourlyRate) as totalBudget "
                     + "   FROM timesheet t"
@@ -1856,7 +1856,7 @@ open class ReportService(
                     + "   left join salary sal on sal.salaryPoint = s.salaryId "
                     + "   GROUP BY t.staffId, t.projectId"
                     + " ) AS tns"
-                    + " GROUP BY projectId"
+                    + " GROUP BY project_id"
                     + " ) "
                     + " SELECT "
                     + " p.code, "