update sub-project & report

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,
             )
         }
     }

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?,
 )

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, "