From e8dabe4763e38b694e90bd9def2c096b0c6dd88f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=9C=E5=BB=BA=E8=B6=85?= <3182967682@qq.com> Date: Wed, 11 Nov 2020 15:55:36 +0800 Subject: [PATCH 1/2] fix --- .../impl/EvaluationGroupServiceImpl.java | 31 +++++++++++++------ 1 file changed, 21 insertions(+), 10 deletions(-) diff --git a/src/main/java/com/lz/modules/flow/service/impl/EvaluationGroupServiceImpl.java b/src/main/java/com/lz/modules/flow/service/impl/EvaluationGroupServiceImpl.java index 7dd6d7ee..aef16fad 100644 --- a/src/main/java/com/lz/modules/flow/service/impl/EvaluationGroupServiceImpl.java +++ b/src/main/java/com/lz/modules/flow/service/impl/EvaluationGroupServiceImpl.java @@ -378,18 +378,28 @@ public class EvaluationGroupServiceImpl extends ServiceImpl ids,EvaluationGroup group) { String staffIds = group.getStaffIds(); - if(StringUtil.isNotBlank(staffIds)){ - String[] split = staffIds.split(","); - Set set = new HashSet(Arrays.asList(split)); - set.removeAll(new HashSet(ids)); //set.addAll(new HashSet(ids)); - String join = StringUtils.join(set, ","); - group.setStaffIds(join); - int i = evaluationGroupMapper.updateCoverEvaluationGroupById(group); - return i; + String outIds = group.getOutIds(); + //删除选中人员 + if(StringUtil.isNotBlank(staffIds)){ + String[] staffs = staffIds.split(","); + Set staffsSet = new HashSet(Arrays.asList(staffs)); + staffsSet.removeAll(ids); + group.setStaffIds(StringUtils.join(staffsSet, ",")); } - return 0; - } + //增加排除人员 + if(StringUtil.isBlank(outIds)){ + group.setOutIds(StringUtils.join(ids, ",")); + } + else { + String[] outs = outIds.split(","); + Set outsSet = new HashSet(Arrays.asList(outs)); + outsSet.addAll(ids); + group.setOutIds(StringUtils.join(outsSet, ",")); + } + + return evaluationGroupMapper.updateById(group); + } @Override public String getEvaluationCopyIdsByEvaluationIds(String evaluationIds,Long startId) { @@ -402,4 +412,5 @@ public class EvaluationGroupServiceImpl extends ServiceImpl Date: Wed, 11 Nov 2020 16:16:15 +0800 Subject: [PATCH 2/2] fix --- .../modules/flow/service/impl/EvaluationGroupServiceImpl.java | 3 ++- .../performance/controller/AssessManagerController.java | 3 ++- .../performance/controller/EvaluationGroupController.java | 2 +- .../performance/service/impl/AssessManagerServiceImpl.java | 2 +- 4 files changed, 6 insertions(+), 4 deletions(-) diff --git a/src/main/java/com/lz/modules/flow/service/impl/EvaluationGroupServiceImpl.java b/src/main/java/com/lz/modules/flow/service/impl/EvaluationGroupServiceImpl.java index aef16fad..a9960339 100644 --- a/src/main/java/com/lz/modules/flow/service/impl/EvaluationGroupServiceImpl.java +++ b/src/main/java/com/lz/modules/flow/service/impl/EvaluationGroupServiceImpl.java @@ -353,7 +353,8 @@ public class EvaluationGroupServiceImpl extends ServiceImpl stringCollect = staffIdsByGroup.stream().distinct().collect(toList()); diff --git a/src/main/java/com/lz/modules/performance/controller/AssessManagerController.java b/src/main/java/com/lz/modules/performance/controller/AssessManagerController.java index 53e9105c..c74ddb24 100644 --- a/src/main/java/com/lz/modules/performance/controller/AssessManagerController.java +++ b/src/main/java/com/lz/modules/performance/controller/AssessManagerController.java @@ -3,6 +3,7 @@ package com.lz.modules.performance.controller; import com.lz.common.utils.PageUtils; import com.lz.common.utils.R; 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.entity.FlowStart; import com.lz.modules.performance.req.AssessChangeReq; @@ -105,7 +106,7 @@ public class AssessManagerController extends AbstractController{ @PostMapping("assess/manager/change") @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){ if(req.getStartId()==null){ return R.error("考核id不能为空"); diff --git a/src/main/java/com/lz/modules/performance/controller/EvaluationGroupController.java b/src/main/java/com/lz/modules/performance/controller/EvaluationGroupController.java index 6412221e..2da9911f 100644 --- a/src/main/java/com/lz/modules/performance/controller/EvaluationGroupController.java +++ b/src/main/java/com/lz/modules/performance/controller/EvaluationGroupController.java @@ -224,7 +224,7 @@ public class EvaluationGroupController extends AbstractController { @PostMapping("/checkStaff") @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) { return evaluationGroupService.checkStaff(checkStaffReq); } diff --git a/src/main/java/com/lz/modules/performance/service/impl/AssessManagerServiceImpl.java b/src/main/java/com/lz/modules/performance/service/impl/AssessManagerServiceImpl.java index 475f164d..8d1c5fb8 100644 --- a/src/main/java/com/lz/modules/performance/service/impl/AssessManagerServiceImpl.java +++ b/src/main/java/com/lz/modules/performance/service/impl/AssessManagerServiceImpl.java @@ -218,7 +218,7 @@ public class AssessManagerServiceImpl implements AssessManagerService { notInGroupNames = notInGroupNames + dto.getName() + " "; } - return R.error(503,notInGroupNames + "未加入月度类型考评组，被考核人需要加入月度考评组后才能参与当前月度考核。"); + return R.error(503,notInGroupNames + "未加入月度类型考评组，被考核人需要加入月度考评组后才能参与当前月度考核。").put("data",staffSimpleDtos); } //初始化添加用户的数据