add sub-contract fee to project

src/main/java/com/ffii/tsms/modules/project/entity/Project.kt

@@ -77,6 +77,9 @@ open class Project : BaseEntity<Long>() {
     @Column(name = "expectedTotalFee")
     open var expectedTotalFee: Double? = null
 
+    @Column(name = "subContractFee")
+    open var subContractFee: Double? = null
+
     @ManyToOne
     @JoinColumn(name = "serviceTypeId")
     open var serviceType: ServiceType? = null

src/main/java/com/ffii/tsms/modules/project/service/ProjectsService.kt

@@ -197,6 +197,7 @@ open class ProjectsService(
                     project
                 ) else this.code
             expectedTotalFee = request.expectedProjectFee
+            subContractFee = request.subContractFee
             totalManhour = request.totalManhour
             actualStart = request.projectActualStart
             actualEnd = request.projectActualEnd
@@ -402,7 +403,8 @@ open class ProjectsService(
                             )
                         })
                 },
-                expectedProjectFee = it.expectedTotalFee
+                expectedProjectFee = it.expectedTotalFee,
+                subContractFee = it.subContractFee
             )
         }
     }
@@ -644,6 +646,7 @@ open class ProjectsService(
                         clientId = clientId,
                         clientSubsidiaryId = subsidiary?.id,
                         expectedProjectFee = row.getCell(9).numericCellValue,
+                        subContractFee = null,
                         totalManhour = row.getCell(11).numericCellValue,
                         locationId = 1, // HK
                         buildingTypeIds = mutableListOf(buildingType!!.id!!),

src/main/java/com/ffii/tsms/modules/project/web/models/EditProjectDetails.kt

@@ -40,5 +40,6 @@ data class EditProjectDetails(
     val milestones: Map<Long, Milestone>,
 
     // Miscellaneous
-    val expectedProjectFee: Double?
+    val expectedProjectFee: Double?,
+    val subContractFee: Double?
 )

src/main/java/com/ffii/tsms/modules/project/web/models/NewProjectRequest.kt

@@ -45,7 +45,8 @@ data class NewProjectRequest(
     val milestones: Map<Long, Milestone>,
 
     // Miscellaneous
-    val expectedProjectFee: Double
+    val expectedProjectFee: Double,
+    val subContractFee: Double?
 )
 
 data class TaskGroupAllocation(

src/main/resources/db/changelog/changes/20240704_01_cyril/01_update_project.sql

@@ -0,0 +1,5 @@
+-- liquibase formatted sql
+-- changeset cyril:project
+
+ALTER TABLE `project`
+    ADD COLUMN `subContractFee` DOUBLE NULL DEFAULT NULL AFTER `expectedTotalFee`;