diff --git a/src/main/java/com/gunshi/project/xyt/mapper/AssessTaskMapper.java b/src/main/java/com/gunshi/project/xyt/mapper/AssessTaskMapper.java index 44f01ba..6518237 100644 --- a/src/main/java/com/gunshi/project/xyt/mapper/AssessTaskMapper.java +++ b/src/main/java/com/gunshi/project/xyt/mapper/AssessTaskMapper.java @@ -24,7 +24,7 @@ public interface AssessTaskMapper extends BaseMapper { @Select(""" diff --git a/src/main/java/com/gunshi/project/xyt/service/AssessTaskService.java b/src/main/java/com/gunshi/project/xyt/service/AssessTaskService.java index 0d94a89..25e1f1a 100644 --- a/src/main/java/com/gunshi/project/xyt/service/AssessTaskService.java +++ b/src/main/java/com/gunshi/project/xyt/service/AssessTaskService.java @@ -119,7 +119,6 @@ public class AssessTaskService extends ServiceImpl List teams = assessObjectService.getTeam(id); teams.stream().forEach(o->o.setStatus(1)); assessObjectService.updateTeams(teams); - //考核指标 List ratings = new ArrayList<>(); List indicatorIds = this.baseMapper.queryIndicators(task.getTemplateId()); @@ -134,6 +133,19 @@ public class AssessTaskService extends ServiceImpl } } teamRatingService.saveBatch(ratings); + + List list = new ArrayList<>(); + for(AssessObject object : objects){ + for(AssessIndicator indicator : indicatorIds){ + AssessObjectRating objectRating = new AssessObjectRating(); + objectRating.setId(IdWorker.getId()); + objectRating.setObjectId(object.getId()); + objectRating.setIndicatorId(indicator.getId()); + objectRating.setStandardScore(indicator.getStandardScore()); + list.add(objectRating); + } + } + teamRatingService.saveObjectRating(list); return "启动成功"; } diff --git a/src/main/java/com/gunshi/project/xyt/service/AssessTeamRatingService.java b/src/main/java/com/gunshi/project/xyt/service/AssessTeamRatingService.java index 3691e26..315413d 100644 --- a/src/main/java/com/gunshi/project/xyt/service/AssessTeamRatingService.java +++ b/src/main/java/com/gunshi/project/xyt/service/AssessTeamRatingService.java @@ -140,6 +140,7 @@ public class AssessTeamRatingService extends ServiceImpl teamIds,Long objectId) { + assessObjectRatingService.remove(new QueryWrapper().eq("object_id",objectId)); final BigDecimal[] score = {new BigDecimal(0)}; List ratings = this.list(new QueryWrapper().in("team_id",teamIds)); Map> map = ratings.stream().collect(Collectors.groupingBy(AssessTeamRating::getIndicatorId,Collectors.mapping(AssessTeamRating::getAssessScore,Collectors.toList()))); @@ -167,6 +168,10 @@ public class AssessTeamRatingService extends ServiceImpl list){ + assessObjectRatingService.saveBatch(list); + } + public String getGroupId() { return "assessTeamRating"; } @@ -198,7 +203,7 @@ public class AssessTeamRatingService extends ServiceImpl> map = relList.stream().collect(Collectors.groupingBy(AssessIndicatorRating::getIndicatorId)); for (AssessRatingVo vo : list){ vo.setIndicatorRatings(map.get(vo.getIndicatorId())); - if(vo.getIsNeedRectify() == 1){ + if(vo.getIsNeedRectify() != null && vo.getIsNeedRectify() == 1){ vo.setFiles(fileService.queryFileList(vo.getId().toString(),getGroupId(),getScoreType())); } }