Переглянути джерело

Add back Project Expense to Project Expense

add_swagger
MSI\2Fi 11 місяці тому
джерело
коміт
659fb14913
2 змінених файлів з 5 додано та 3 видалено
  1. +4
    -2
      src/main/java/com/ffii/tsms/modules/project/service/ProjectExpenseService.kt
  2. +1
    -1
      src/main/java/com/ffii/tsms/modules/project/web/models/EditProjectExpenseRequest.kt

+ 4
- 2
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 }


+ 1
- 1
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,


Завантаження…
Відмінити
Зберегти