| @@ -4,6 +4,7 @@ package com.ffii.tsms.modules.data.entity.projections; | |||||
| * Projection for {@link com.ffii.tsms.modules.data.entity.Salary} | * Projection for {@link com.ffii.tsms.modules.data.entity.Salary} | ||||
| */ | */ | ||||
| public interface SalarySearchInfo { | public interface SalarySearchInfo { | ||||
| Long getId(); | |||||
| Integer getSalaryPoint(); | Integer getSalaryPoint(); | ||||
| Integer getLowerLimit(); | Integer getLowerLimit(); | ||||
| Integer getUpperLimit(); | Integer getUpperLimit(); | ||||
| @@ -27,6 +27,13 @@ open class CompanyService( | |||||
| contactName = request.contactName | contactName = request.contactName | ||||
| phone = request.phone | phone = request.phone | ||||
| email = request.email | 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) | return companyRepository.save(company) | ||||
| @@ -21,8 +21,10 @@ import org.springframework.web.bind.annotation.ResponseStatus | |||||
| @RestController | @RestController | ||||
| @RequestMapping("/customer") | @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 | @GetMapping | ||||
| fun allCustomers(): List<Customer> { | fun allCustomers(): List<Customer> { | ||||
| @@ -1,6 +1,7 @@ | |||||
| package com.ffii.tsms.modules.data.web.models | package com.ffii.tsms.modules.data.web.models | ||||
| import jakarta.validation.constraints.NotBlank | import jakarta.validation.constraints.NotBlank | ||||
| import java.time.LocalTime | |||||
| data class NewCompanyRequest ( | data class NewCompanyRequest ( | ||||
| @field: NotBlank(message = "Company code cannot be empty") | @field: NotBlank(message = "Company code cannot be empty") | ||||
| @@ -11,5 +12,12 @@ data class NewCompanyRequest ( | |||||
| val brNo: String, | val brNo: String, | ||||
| val contactName: String, | val contactName: String, | ||||
| val phone: 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, | |||||
| ) | ) | ||||