From e1c1b185c1316149c433ee0e61dd36493036c551 Mon Sep 17 00:00:00 2001 From: "MSI\\2Fi" Date: Mon, 23 Dec 2024 15:22:53 +0800 Subject: [PATCH] Update backend to handle when stage start date and stage end date is null --- .../com/ffii/tsms/modules/project/service/ProjectsService.kt | 4 ++-- 1 file changed, 2 insertions(+), 2 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 c3142e4..e1665c2 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 @@ -286,8 +286,8 @@ open class ProjectsService( val requestMilestone = request.milestones[taskStageId] this.project = project this.taskGroup = taskGroupMap[taskStageId] - this.startDate = requestMilestone?.startDate?.let { LocalDate.parse(it) } - this.endDate = requestMilestone?.endDate?.let { LocalDate.parse(it) } + this.startDate = requestMilestone?.startDate?.let { LocalDate.parse(it) } ?: request.projectPlanStart + this.endDate = requestMilestone?.endDate?.let { LocalDate.parse(it) } ?: request.projectPlanEnd if (this.milestonePayments.isNotEmpty()) { this.milestonePayments.removeAll(this.milestonePayments) }