fix
This commit is contained in:
parent
d2094cf630
commit
dac93c472e
@ -310,7 +310,7 @@ public class EvaluationGroupServiceImpl extends ServiceImpl<EvaluationGroupMappe
|
||||
}
|
||||
|
||||
if(evaluationGroup.getConfirm()==0){
|
||||
return R.error(notInGroupNames + "已在其他类型为月度的考评组中,是否改为到此考评组中进行考核");
|
||||
return R.error(504,notInGroupNames + "已在其他类型为月度的考评组中,是否改为到此考评组中进行考核");
|
||||
}
|
||||
evaluationGroups.forEach(evaluationGroup12 -> {
|
||||
List<String> staffs = map.get(evaluationGroup12.getId());
|
||||
|
||||
@ -94,7 +94,7 @@ public class AssessManagerController {
|
||||
|
||||
@PostMapping("assess/manager/change")
|
||||
@ApiOperation("考核管理组管理变更")
|
||||
@ApiResponses({@ApiResponse(code = 200,message = "成功")})
|
||||
@ApiResponses({@ApiResponse(code = 200,message = "成功"),@ApiResponse(code = 503,message = "去设置")})
|
||||
public R assessChange(@RequestBody AssessChangeReq req){
|
||||
if(req.getStartId()==null){
|
||||
return R.error("考核id不能为空");
|
||||
|
||||
@ -193,6 +193,7 @@ public class EvaluationGroupController {
|
||||
|
||||
@PostMapping("/checkStaff")
|
||||
@ApiOperation("校验是否有跨组人员")
|
||||
@ApiResponses({@ApiResponse(code = 200,message = "成功"),@ApiResponse(code = 504,message = "已跨组")})
|
||||
public R checkStaff(@RequestBody @ApiParam(required = true,name = "body") CheckStaffReq checkStaffReq) {
|
||||
return evaluationGroupService.checkStaff(checkStaffReq);
|
||||
}
|
||||
|
||||
@ -169,8 +169,7 @@ public class AssessManagerServiceImpl implements AssessManagerService {
|
||||
notInGroupNames = notInGroupNames + dto.getName() + " ";
|
||||
}
|
||||
|
||||
throw new RRException(notInGroupNames + "未加入月度类型考评组,被考核人需要加入月度考评组后才能参与当前月度考核。");
|
||||
|
||||
return R.error(503,notInGroupNames + "未加入月度类型考评组,被考核人需要加入月度考评组后才能参与当前月度考核。");
|
||||
}
|
||||
|
||||
//初始化添加用户的数据
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user