wulin/wl_management
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix

Browse Source
This commit is contained in:
杜建超 2020-11-11 16:16:15 +08:00
parent 777432b0cd
commit 9d370b7959
4 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/main/java/com/lz/modules/flow/service/impl/EvaluationGroupServiceImpl.java
View File

@ -353,7 +353,8 @@ public class EvaluationGroupServiceImpl extends ServiceImpl<EvaluationGroupMappe
} }
if(evaluationGroup.getConfirm()==0){ if(evaluationGroup.getConfirm()==0){
return R.error(504,notInGroupNames + "已在其他类型为月度的考评组中，是否改为到此考评组中进行考核");
return R.error(504,notInGroupNames + "已在其他类型为月度的考评组中，是否改为到此考评组中进行考核").put("data",staffSimpleDtos);
} }
List<String> stringCollect = staffIdsByGroup.stream().distinct().collect(toList()); List<String> stringCollect = staffIdsByGroup.stream().distinct().collect(toList());

3
src/main/java/com/lz/modules/performance/controller/AssessManagerController.java
View File

@ -3,6 +3,7 @@ package com.lz.modules.performance.controller;
import com.lz.common.utils.PageUtils; import com.lz.common.utils.PageUtils;
import com.lz.common.utils.R; import com.lz.common.utils.R;
import com.lz.common.utils.StringUtil; import com.lz.common.utils.StringUtil;
import com.lz.modules.app.dto.StaffSimpleDto;
import com.lz.modules.flow.dao.FlowStartMapper; import com.lz.modules.flow.dao.FlowStartMapper;
import com.lz.modules.flow.entity.FlowStart; import com.lz.modules.flow.entity.FlowStart;
import com.lz.modules.performance.req.AssessChangeReq; import com.lz.modules.performance.req.AssessChangeReq;
@ -105,7 +106,7 @@ public class AssessManagerController extends AbstractController{
@PostMapping("assess/manager/change") @PostMapping("assess/manager/change")
@ApiOperation("考核管理组管理变更") @ApiOperation("考核管理组管理变更")
@ApiResponses({@ApiResponse(code = 200,message = "成功"),@ApiResponse(code = 503,message = "去设置")}) @ApiResponses({@ApiResponse(code = 200,message = "成功"),@ApiResponse(code = 503,message = "去设置",response = StaffSimpleDto.class)})
public R assessChange(@RequestBody AssessChangeReq req){ public R assessChange(@RequestBody AssessChangeReq req){
if(req.getStartId()==null){ if(req.getStartId()==null){
return R.error("考核id不能为空"); return R.error("考核id不能为空");

2
src/main/java/com/lz/modules/performance/controller/EvaluationGroupController.java
View File

@ -224,7 +224,7 @@ public class EvaluationGroupController extends AbstractController {
@PostMapping("/checkStaff") @PostMapping("/checkStaff")
@ApiOperation("校验是否有跨组人员") @ApiOperation("校验是否有跨组人员")
@ApiResponses({@ApiResponse(code = 200,message = "成功"),@ApiResponse(code = 504,message = "已跨组")}) @ApiResponses({@ApiResponse(code = 200,message = "成功"),@ApiResponse(code = 504,message = "已跨组",response = StaffSimpleDto.class)})
public R checkStaff(@RequestBody @ApiParam(required = true,name = "body") CheckStaffReq checkStaffReq) { public R checkStaff(@RequestBody @ApiParam(required = true,name = "body") CheckStaffReq checkStaffReq) {
return evaluationGroupService.checkStaff(checkStaffReq); return evaluationGroupService.checkStaff(checkStaffReq);
} }

2
src/main/java/com/lz/modules/performance/service/impl/AssessManagerServiceImpl.java
View File

@ -218,7 +218,7 @@ public class AssessManagerServiceImpl implements AssessManagerService {
notInGroupNames = notInGroupNames + dto.getName() + " "; notInGroupNames = notInGroupNames + dto.getName() + " ";
} }
return R.error(503,notInGroupNames + "未加入月度类型考评组，被考核人需要加入月度考评组后才能参与当前月度考核。"); return R.error(503,notInGroupNames + "未加入月度类型考评组，被考核人需要加入月度考评组后才能参与当前月度考核。").put("data",staffSimpleDtos);
} }
//初始化添加用户的数据 //初始化添加用户的数据