251216_01_ENH : 프로젝트에 FW User 배정 구현 및 테스트 완료
This commit is contained in:
@@ -21,7 +21,18 @@ public class AssignController {
|
||||
private final AssignService assignService;
|
||||
|
||||
@GetMapping("/prjct-outsource/{prjctIdx}")
|
||||
public List<String> getPrjctOutsourceAssign(@PathVariable Long prjctIdx, RequestUserContext ctx){
|
||||
public List<String> getPrjctOutsourceAssign(@PathVariable Long prjctIdx){
|
||||
return assignService.getPrjctOutsourceAssign(prjctIdx);
|
||||
}
|
||||
|
||||
@GetMapping("/prjct-fieldwork/{prjctIdx}")
|
||||
public List<String> getPrjctFieldworkAssign(@PathVariable Long prjctIdx){
|
||||
return assignService.getPrjctFieldworkAssign(prjctIdx);
|
||||
}
|
||||
|
||||
@PutMapping("/prjct-fieldwork/{prjctIdx}")
|
||||
public void upsertPrjctFieldworkAssign(@PathVariable Long prjctIdx, @RequestBody List<String> assignUserIdList, RequestUserContext ctx){
|
||||
assignService.upsertPrjctFieldworkAssign(prjctIdx, assignUserIdList, ctx.getUserId());
|
||||
systemEventLogService.writeAssignUserProject(ctx.getUserId(), ctx.getClientIp(), prjctIdx, assignUserIdList);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -40,16 +40,27 @@ public class UserController {
|
||||
|
||||
@GetMapping()
|
||||
public List<UserInfoDto> getUserList(RequestUserContext ctx){
|
||||
String searchCmpn = ctx.getUserCmpn();
|
||||
if(ctx.getUserRole() < AppConstant.OUTSOURCE_USER_ROLE){
|
||||
return userService.getUserList();
|
||||
}
|
||||
else{
|
||||
return userService.getFieldworkUserListWithCmpn(searchCmpn);
|
||||
}
|
||||
}
|
||||
|
||||
@GetMapping("fieldwork")
|
||||
public List<UserInfoDto> getFiledoworkUserList(RequestUserContext ctx){
|
||||
String searchCmpn = ctx.getUserCmpn();
|
||||
if(ctx.getUserRole() < AppConstant.OUTSOURCE_USER_ROLE){
|
||||
searchCmpn = "";
|
||||
}
|
||||
|
||||
return userService.getUserListWithCmpn(searchCmpn);
|
||||
return userService.getFieldworkUserListWithCmpn(searchCmpn);
|
||||
}
|
||||
|
||||
@GetMapping("outsource")
|
||||
List<UserInfoDto> getOutsourceList(RequestUserContext ctx){
|
||||
List<UserInfoDto> getOutsourceList(){
|
||||
return userService.getOutsourceList();
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user