From 0a11c4c60ba1d258effa7edba0ec5b2dccc9d349 Mon Sep 17 00:00:00 2001 From: "MSI\\2Fi" Date: Fri, 19 Apr 2024 18:24:29 +0800 Subject: [PATCH] Update Company --- .../data/entity/projections/SalarySearchInfo.java | 1 + .../ffii/tsms/modules/data/service/CompanyService.kt | 7 +++++++ .../ffii/tsms/modules/data/web/CustomerController.kt | 6 ++++-- .../tsms/modules/data/web/models/NewCompanyRequest.kt | 10 +++++++++- 4 files changed, 21 insertions(+), 3 deletions(-) diff --git a/src/main/java/com/ffii/tsms/modules/data/entity/projections/SalarySearchInfo.java b/src/main/java/com/ffii/tsms/modules/data/entity/projections/SalarySearchInfo.java index 6269ea1..a6d3d52 100644 --- a/src/main/java/com/ffii/tsms/modules/data/entity/projections/SalarySearchInfo.java +++ b/src/main/java/com/ffii/tsms/modules/data/entity/projections/SalarySearchInfo.java @@ -4,6 +4,7 @@ package com.ffii.tsms.modules.data.entity.projections; * Projection for {@link com.ffii.tsms.modules.data.entity.Salary} */ public interface SalarySearchInfo { + Long getId(); Integer getSalaryPoint(); Integer getLowerLimit(); Integer getUpperLimit(); diff --git a/src/main/java/com/ffii/tsms/modules/data/service/CompanyService.kt b/src/main/java/com/ffii/tsms/modules/data/service/CompanyService.kt index a30e97b..0eabad1 100644 --- a/src/main/java/com/ffii/tsms/modules/data/service/CompanyService.kt +++ b/src/main/java/com/ffii/tsms/modules/data/service/CompanyService.kt @@ -27,6 +27,13 @@ open class CompanyService( contactName = request.contactName phone = request.phone email = request.email + normalHourTo = request.normalHourTo + normalHourFrom = request.normalHourFrom + otHourTo = request.otHourTo + otHourFrom = request.otHourFrom + address = request.address + district = request.district + currency = request.currency } return companyRepository.save(company) diff --git a/src/main/java/com/ffii/tsms/modules/data/web/CustomerController.kt b/src/main/java/com/ffii/tsms/modules/data/web/CustomerController.kt index dd5a592..19c0001 100644 --- a/src/main/java/com/ffii/tsms/modules/data/web/CustomerController.kt +++ b/src/main/java/com/ffii/tsms/modules/data/web/CustomerController.kt @@ -21,8 +21,10 @@ import org.springframework.web.bind.annotation.ResponseStatus @RestController @RequestMapping("/customer") -class CustomerController(private val customerService: CustomerService, private val customerSubsidiaryService: CustomerSubsidiaryService, - private val customerContactService: CustomerContactService +class CustomerController( + private val customerService: CustomerService, + private val customerSubsidiaryService: CustomerSubsidiaryService, + private val customerContactService: CustomerContactService ) { @GetMapping fun allCustomers(): List { diff --git a/src/main/java/com/ffii/tsms/modules/data/web/models/NewCompanyRequest.kt b/src/main/java/com/ffii/tsms/modules/data/web/models/NewCompanyRequest.kt index f6f46e8..7f55dd9 100644 --- a/src/main/java/com/ffii/tsms/modules/data/web/models/NewCompanyRequest.kt +++ b/src/main/java/com/ffii/tsms/modules/data/web/models/NewCompanyRequest.kt @@ -1,6 +1,7 @@ package com.ffii.tsms.modules.data.web.models import jakarta.validation.constraints.NotBlank +import java.time.LocalTime data class NewCompanyRequest ( @field: NotBlank(message = "Company code cannot be empty") @@ -11,5 +12,12 @@ data class NewCompanyRequest ( val brNo: String, val contactName: String, val phone: String, - val email: String + val email: String, + val normalHourFrom: LocalTime, + val normalHourTo: LocalTime, + val otHourFrom: LocalTime, + val otHourTo: LocalTime, + val address: String, + val district: String, + val currency: String, )