From 659fb149130ec05309efad09b2ad09d18cf82375 Mon Sep 17 00:00:00 2001 From: "MSI\\2Fi" Date: Fri, 13 Sep 2024 17:30:04 +0800 Subject: [PATCH] Add back Project Expense to Project Expense --- .../tsms/modules/project/service/ProjectExpenseService.kt | 6 ++++-- .../modules/project/web/models/EditProjectExpenseRequest.kt | 2 +- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/src/main/java/com/ffii/tsms/modules/project/service/ProjectExpenseService.kt b/src/main/java/com/ffii/tsms/modules/project/service/ProjectExpenseService.kt index 6828148..4d87ae2 100644 --- a/src/main/java/com/ffii/tsms/modules/project/service/ProjectExpenseService.kt +++ b/src/main/java/com/ffii/tsms/modules/project/service/ProjectExpenseService.kt @@ -9,6 +9,8 @@ import com.ffii.tsms.modules.project.entity.projections.ProjectExpenseSearchInfo import com.ffii.tsms.modules.project.web.models.EditProjectExpenseRequest import com.ffii.tsms.modules.project.web.models.ProjectExpenseRequest import org.springframework.stereotype.Service +import java.time.LocalDate +import java.time.format.DateTimeFormatter @Service open class ProjectExpenseService( @@ -49,12 +51,12 @@ open class ProjectExpenseService( open fun updateProjectExpenseDetail(projectExpenseReq: EditProjectExpenseRequest): ProjectExpenseSearchInfo?{ val projectExpense = repository.findById(projectExpenseReq.id!!) - + val formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd") if(projectExpense.isPresent){ projectExpense.get().apply { projectExpenseReq.expenseNo?.let{ expenseNo = it} -// projectExpenseReq.issueDate?.let { issueDate = it } + projectExpenseReq.issueDate?.let { issueDate = LocalDate.parse(it, formatter) } // projectExpenseReq.receiptDate?.let{ receiptDate = it } amount = projectExpenseReq.amount projectExpenseReq.remarks?.let { remarks = it } diff --git a/src/main/java/com/ffii/tsms/modules/project/web/models/EditProjectExpenseRequest.kt b/src/main/java/com/ffii/tsms/modules/project/web/models/EditProjectExpenseRequest.kt index e9b531c..116d5df 100644 --- a/src/main/java/com/ffii/tsms/modules/project/web/models/EditProjectExpenseRequest.kt +++ b/src/main/java/com/ffii/tsms/modules/project/web/models/EditProjectExpenseRequest.kt @@ -6,7 +6,7 @@ import java.time.LocalDate data class EditProjectExpenseRequest ( val id: Long?, val expenseNo: String?, -// val issueDate: LocalDate?, + val issueDate: String?, // val receiptDate: LocalDate?, @field:NotNull(message = "amount cannot be empty") val amount: Double,