fix(task): 解决项目任务评分权限控制和状态更新问题
parent
ce2426cbd7
commit
63cb072f8d
|
|
@ -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<ProjectTaskScoreInfoDO> 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){
|
||||
//完成后,发送消息通知
|
||||
|
||||
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -42,9 +42,9 @@ public class ProjectTaskRepositoryImpl extends BaseRepositoryImpl<ProjectTaskMap
|
|||
if (params.get("corpinfoId") != null && StringUtils.isNotEmpty(params.get("corpinfoId").toString())) {
|
||||
params.put("corpinfoId", params.get("corpinfoId"));
|
||||
} else {
|
||||
if(!corpInfoRepository.isSupper()){
|
||||
/*if(!corpInfoRepository.isSupper()){
|
||||
params.put("corpinfoId", AuthContext.getTenantId());
|
||||
}
|
||||
}*/
|
||||
}
|
||||
String menuPerms = "";
|
||||
if (!org.springframework.util.ObjectUtils.isEmpty(params.get("menuPath"))){
|
||||
|
|
|
|||
Loading…
Reference in New Issue