diff --git a/web-app/src/main/java/com/zcloud/domain/command/ProjectTaskScoreInfoUpdateExe.java b/web-app/src/main/java/com/zcloud/domain/command/ProjectTaskScoreInfoUpdateExe.java index 97e48e2..542fffb 100644 --- a/web-app/src/main/java/com/zcloud/domain/command/ProjectTaskScoreInfoUpdateExe.java +++ b/web-app/src/main/java/com/zcloud/domain/command/ProjectTaskScoreInfoUpdateExe.java @@ -57,8 +57,6 @@ public class ProjectTaskScoreInfoUpdateExe { throw new BizException("只允许设置自己的评分"); } - - ProjectTaskScoreInfoE projectTaskScoreInfoE = new ProjectTaskScoreInfoE(); BeanUtils.copyProperties(projectTaskSetScoreCmd, projectTaskScoreInfoE); boolean res = projectTaskScoreInfoGateway.update(projectTaskScoreInfoE); @@ -67,6 +65,7 @@ public class ProjectTaskScoreInfoUpdateExe { } //判断是否所有人都评分完成,如果完成则修改任务状态为完成 List listByTaskId = projectTaskScoreInfoRepository.getListByTaskId(info.getProjectTaskId()); + Boolean finish = false; if(listByTaskId.size()==listByTaskId.stream().filter(item -> item.getScore() != null).count()){ BigDecimal totalScore = listByTaskId.stream() .map(ProjectTaskScoreInfoDO::getScore) @@ -76,9 +75,14 @@ public class ProjectTaskScoreInfoUpdateExe { BigDecimal averageScore = totalScore.divide(new BigDecimal(listByTaskId.size()),2,RoundingMode.HALF_UP); projectTaskRepository.updateScoreStatus(info.getProjectTaskId(), ScoreStatusEnum.SCORED.getCode(),averageScore); + finish = true; }else{ //修改为评分中 projectTaskRepository.updateScoreStatus(info.getProjectTaskId(), ScoreStatusEnum.SCOREING.getCode(),null); + } + if(finish){ + //完成后,发送消息通知 + } diff --git a/web-infrastructure/src/main/java/com/zcloud/domain/persistence/repository/impl/ProjectTaskRepositoryImpl.java b/web-infrastructure/src/main/java/com/zcloud/domain/persistence/repository/impl/ProjectTaskRepositoryImpl.java index 530bbf2..9e9058c 100644 --- a/web-infrastructure/src/main/java/com/zcloud/domain/persistence/repository/impl/ProjectTaskRepositoryImpl.java +++ b/web-infrastructure/src/main/java/com/zcloud/domain/persistence/repository/impl/ProjectTaskRepositoryImpl.java @@ -42,9 +42,9 @@ public class ProjectTaskRepositoryImpl extends BaseRepositoryImpl