Browse Source

1. Fix Salary api naming

2. add create company api
tags/Baseline_30082024_BACKEND_UAT
MSI\2Fi 1 year ago
parent
commit
3c9740864e
5 changed files with 44 additions and 6 deletions
  1. +17
    -0
      src/main/java/com/ffii/tsms/modules/data/service/CompanyService.kt
  2. +1
    -1
      src/main/java/com/ffii/tsms/modules/data/service/SalaryService.kt
  3. +9
    -3
      src/main/java/com/ffii/tsms/modules/data/web/CompanyController.kt
  4. +2
    -2
      src/main/java/com/ffii/tsms/modules/data/web/SalaryController.kt
  5. +15
    -0
      src/main/java/com/ffii/tsms/modules/data/web/models/NewCompanyRequest.kt

+ 17
- 0
src/main/java/com/ffii/tsms/modules/data/service/CompanyService.kt View File

@@ -4,7 +4,10 @@ import com.ffii.core.support.AbstractBaseEntityService
import com.ffii.core.support.JdbcDao
import com.ffii.tsms.modules.data.entity.Company
import com.ffii.tsms.modules.data.entity.CompanyRepository
import com.ffii.tsms.modules.data.entity.Position
import com.ffii.tsms.modules.data.entity.projections.CompanySearchInfo
import com.ffii.tsms.modules.data.web.models.NewCompanyRequest
import com.ffii.tsms.modules.data.web.models.NewPositionRequest
import org.springframework.stereotype.Service
@Service
open class CompanyService(
@@ -15,6 +18,20 @@ open class CompanyService(
return companyRepository.findCompanySearchInfoBy()
}

open fun saveCompany(request: NewCompanyRequest): Company {
val company =
Company().apply {
name = request.companyName
companyCode = request.companyCode
brNo = request.brNo
contactName = request.contactName
phone = request.phone
email = request.email
}

return companyRepository.save(company)
}


open fun combo(args: Map<String, Any>): List<Map<String, Any>> {
val sql = StringBuilder("select"


+ 1
- 1
src/main/java/com/ffii/tsms/modules/data/service/SalaryService.kt View File

@@ -16,7 +16,7 @@ open class SalaryService(
private val salaryRepository: SalaryRepository,
) : AbstractIdEntityService<Salary, Long, SalaryRepository>(jdbcDao, salaryRepository) {

fun allSalary(): List<SalarySearchInfo>{
open fun allSalarys(): List<SalarySearchInfo>{
return salaryRepository.findSalarySearchInfoBy()
}



+ 9
- 3
src/main/java/com/ffii/tsms/modules/data/web/CompanyController.kt View File

@@ -2,13 +2,14 @@ package com.ffii.tsms.modules.data.web.models

import com.ffii.core.response.RecordsRes
import com.ffii.core.utils.CriteriaArgsBuilder
import com.ffii.tsms.modules.data.entity.Company
import com.ffii.tsms.modules.data.entity.Position
import com.ffii.tsms.modules.data.entity.projections.CompanySearchInfo
import com.ffii.tsms.modules.data.service.CompanyService
import jakarta.servlet.http.HttpServletRequest
import jakarta.validation.Valid
import org.springframework.web.bind.ServletRequestBindingException
import org.springframework.web.bind.annotation.GetMapping
import org.springframework.web.bind.annotation.RequestMapping
import org.springframework.web.bind.annotation.RestController
import org.springframework.web.bind.annotation.*


@RestController
@@ -23,6 +24,11 @@ class CompanyController(private val companyService: CompanyService) {
// return companyService.allCompanys()
// }

@PostMapping("/new")
fun saveCompany(@Valid @RequestBody newCompany: NewCompanyRequest): Company {
return companyService.saveCompany(newCompany)
}

@GetMapping("/combo")
@Throws(ServletRequestBindingException::class)
fun combo(request: HttpServletRequest?): RecordsRes<Map<String, Any>> {


+ 2
- 2
src/main/java/com/ffii/tsms/modules/data/web/SalaryController.kt View File

@@ -13,14 +13,14 @@ import org.springframework.web.bind.annotation.RestController


@RestController
@RequestMapping("/salary")
@RequestMapping("/salarys")
class SalaryController(
private val salaryService: SalaryService
) {

@GetMapping
fun allSalarys(): List<SalarySearchInfo> {
return salaryService.allSalary()
return salaryService.allSalarys()
}

@GetMapping("/combo")


+ 15
- 0
src/main/java/com/ffii/tsms/modules/data/web/models/NewCompanyRequest.kt View File

@@ -0,0 +1,15 @@
package com.ffii.tsms.modules.data.web.models

import jakarta.validation.constraints.NotBlank

data class NewCompanyRequest (
@field: NotBlank(message = "Company code cannot be empty")
val companyCode: String,
@field:NotBlank(message = "Company name cannot be empty")
val companyName: String,
@field:NotBlank(message = "brNo cannot be empty")
val brNo: String,
val contactName: String,
val phone: String,
val email: String
)

Loading…
Cancel
Save