Browse Source

update

tags/Baseline_30082024_BACKEND_UAT
MSI\derek 1 year ago
parent
commit
409bc77409
2 changed files with 21 additions and 2 deletions
  1. +19
    -1
      src/main/java/com/ffii/tsms/modules/data/web/TeamController.kt
  2. +2
    -1
      src/main/java/com/ffii/tsms/modules/data/web/models/NewTeamRequest.kt

+ 19
- 1
src/main/java/com/ffii/tsms/modules/data/web/TeamController.kt View File

@@ -1,8 +1,11 @@
package com.ffii.tsms.modules.data.web package com.ffii.tsms.modules.data.web


import com.ffii.core.exception.NotFoundException
import com.ffii.core.response.RecordsRes import com.ffii.core.response.RecordsRes
import com.ffii.core.utils.CriteriaArgsBuilder import com.ffii.core.utils.CriteriaArgsBuilder
import com.ffii.core.utils.Params
import com.ffii.tsms.modules.data.entity.Team import com.ffii.tsms.modules.data.entity.Team
import com.ffii.tsms.modules.data.service.StaffsService
import com.ffii.tsms.modules.data.service.TeamService import com.ffii.tsms.modules.data.service.TeamService
import com.ffii.tsms.modules.data.web.models.NewTeamRequest import com.ffii.tsms.modules.data.web.models.NewTeamRequest
import jakarta.servlet.http.HttpServletRequest import jakarta.servlet.http.HttpServletRequest
@@ -15,7 +18,10 @@ import org.springframework.web.bind.annotation.*


@RestController @RestController
@RequestMapping("/team") @RequestMapping("/team")
class TeamController(private val teamService: TeamService) {
class TeamController(
private val teamService: TeamService,
private val staffsService: StaffsService,
) {


@GetMapping @GetMapping
fun allStaff(args: Map<String, Any>): List<Map<String, Any>> { fun allStaff(args: Map<String, Any>): List<Map<String, Any>> {
@@ -34,6 +40,18 @@ class TeamController(private val teamService: TeamService) {
return teamService.getTeamDetail(args); return teamService.getTeamDetail(args);
} }


@GetMapping("/{id}")
fun getStaff(@PathVariable id: Long): MutableMap<String, Any> {
val map: MutableMap<String, Any> = mutableMapOf("team" to teamService.find(id).orElseThrow { NotFoundException() })
val staffList = staffsService.findAllByTeamId(id).orElseThrow { NotFoundException() }
val staffIdList: MutableList<Long> = mutableListOf()
for (staff in staffList) {
staffIdList.add(staff.id as Long)
}
map["staffIds"] = staffIdList
return map
}

// @Transactional(rollbackFor = [Exception::class]) // @Transactional(rollbackFor = [Exception::class])
@DeleteMapping("/delete/{id}") @DeleteMapping("/delete/{id}")
@ResponseStatus(HttpStatus.NO_CONTENT) @ResponseStatus(HttpStatus.NO_CONTENT)


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

@@ -6,7 +6,8 @@ import java.time.LocalDate


data class NewTeamRequest ( data class NewTeamRequest (
val addStaffIds: List<Long>?, val addStaffIds: List<Long>?,

val name: String,
val code: String,
val deleteStaffIds: List<Long>?, val deleteStaffIds: List<Long>?,
val description: String?, val description: String?,
val id: Long? val id: Long?

Loading…
Cancel
Save