优化详情接口

This commit is contained in:
wulin 2020-11-11 13:59:15 +08:00
parent 6540c2093f
commit 7ccfbc9fc2

View File

@ -387,9 +387,9 @@ public class ResultRecordController extends AbstractController {
staffs.addAll(departManagers.getManagers()); staffs.addAll(departManagers.getManagers());
} }
} }
if(staffs.size() == 0){ /*if(staffs.size() == 0){
return R.error("找不到有效的评分人,设置的评分人不存在"); return R.error("找不到有效的评分人,设置的评分人不存在");
} }*/
for (StaffEntity staff:staffs for (StaffEntity staff:staffs
) { ) {
@ -426,6 +426,7 @@ public class ResultRecordController extends AbstractController {
//下面设置计算公式 //下面设置计算公式
dto.setCalculate(setCalculateValue(calculateModels, dto)) ; dto.setCalculate(setCalculateValue(calculateModels, dto)) ;
weight = weight.add(dto.getCheckWeight()); weight = weight.add(dto.getCheckWeight());
if(scoreDtos.size() > 0){
//获取评分详细 //获取评分详细
List<ResultScore> scores = List<ResultScore> scores =
resultScoreService.selectResultScoresByDetailIdAndOrderByStaffIds(dto.getId(), scoreDtos); resultScoreService.selectResultScoresByDetailIdAndOrderByStaffIds(dto.getId(), scoreDtos);
@ -463,6 +464,8 @@ public class ResultRecordController extends AbstractController {
dto.setScoreDtos(scoreDtos); dto.setScoreDtos(scoreDtos);
} }
} }
}
resultRecortModelDto.setDetailDtos(detailDtos); resultRecortModelDto.setDetailDtos(detailDtos);