diff --git a/src/main/java/com/lz/modules/flow/dao/EvaluationStartStaffMapper.java b/src/main/java/com/lz/modules/flow/dao/EvaluationStartStaffMapper.java index aa8107fd..11b182e2 100644 --- a/src/main/java/com/lz/modules/flow/dao/EvaluationStartStaffMapper.java +++ b/src/main/java/com/lz/modules/flow/dao/EvaluationStartStaffMapper.java @@ -38,4 +38,7 @@ public interface EvaluationStartStaffMapper extends BaseMapper ids = evaluationGroupService.selectAllStaffIdsByGroupId(group.getId()); group.setCounts(ids.size()); + int i = evaluationStartStaffMapper.existByStartIdAndEvaluationId(req.getStartId(),group.getId()); + if(i>0){ + group.setScore(1); + } } return pageUtils; } diff --git a/src/main/java/com/lz/modules/flow/service/impl/EvaluationStartStaffServiceImpl.java b/src/main/java/com/lz/modules/flow/service/impl/EvaluationStartStaffServiceImpl.java index a0b42fc4..b58ac946 100644 --- a/src/main/java/com/lz/modules/flow/service/impl/EvaluationStartStaffServiceImpl.java +++ b/src/main/java/com/lz/modules/flow/service/impl/EvaluationStartStaffServiceImpl.java @@ -98,4 +98,9 @@ public class EvaluationStartStaffServiceImpl extends ServiceImpl strings = Arrays.asList(split); List ids = strings.stream().map(s -> Long.valueOf(s)).collect(toList()); List evaluationGroups = evaluationGroupService.selectEvaluationGroupByIds(ids); Set staffIds = new HashSet<>(); + //获取所有考核人员 for(EvaluationGroup group:evaluationGroups){ List staff = evaluationGroupService.selectAllStaffIdsByGroupId(group.getId()); staffIds.addAll(staff); } List all = new ArrayList<>(staffIds); + String[] changeStaffIds = req.getStaffIds().split(","); List change = Arrays.asList(changeStaffIds); if(req.getChangeType() == 0){ //获取不在考评组的人员 @@ -142,10 +145,26 @@ public class AssessManagerServiceImpl implements AssessManagerService { } if(req.getChangeType() == 1){ + //删除本次考核任务 resultRecordMapper.batchDeleteByStartIdAndStaffId(req.getStartId(),change); return ok; } return ok; + } + + + @Override + public void toScore(AssessToScoreReq req) { + String[] split = req.getEvaluationIds().split(","); + for(String s:split){ + int i = evaluationStartStaffService.existByStartIdAndEvaluationId(req.getStartId(), Long.valueOf(s)); + if(i<1){ + + } + } + + + } } diff --git a/src/main/resources/mapper/flow/EvaluationStartStaffMapper.xml b/src/main/resources/mapper/flow/EvaluationStartStaffMapper.xml index fd93ca1a..90d82fc7 100644 --- a/src/main/resources/mapper/flow/EvaluationStartStaffMapper.xml +++ b/src/main/resources/mapper/flow/EvaluationStartStaffMapper.xml @@ -126,5 +126,9 @@ AND staff_id =#{staffId} and type = 1 is_delete = 0 and limit 1 +