wulin/wl_management
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

优化详情接口

Browse Source
This commit is contained in:
wulin 2020-11-11 13:59:15 +08:00
parent 6540c2093f
commit 7ccfbc9fc2
1 changed files with 31 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

59
src/main/java/com/lz/modules/app/controller/ResultRecordController.java
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,45 +426,48 @@ 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 = //获取评分详细
resultScoreService.selectResultScoresByDetailIdAndOrderByStaffIds(dto.getId(), scoreDtos); List<ResultScore> scores =
if(scores.size() > 0){ resultScoreService.selectResultScoresByDetailIdAndOrderByStaffIds(dto.getId(), scoreDtos);
// if(scores.size() > 0){
List<ResultScoreDto> scoreDtos1 = new ArrayList<>();
for (ResultScoreDto scoreDto: scoreDtos
) {//
// //
boolean isAdd = false; List<ResultScoreDto> scoreDtos1 = new ArrayList<>();
for (ResultScore score: for (ResultScoreDto scoreDto: scoreDtos
scores) { ) {//
if(scoreDto.getApprovalId().longValue() == score.getApprovalId().longValue()){ //
boolean isAdd = false;
for (ResultScore score:
scores) {
if(scoreDto.getApprovalId().longValue() == score.getApprovalId().longValue()){
ResultScoreDto scoreDto1 = new ResultScoreDto();
BeanUtils.copyProperties(score, scoreDto1);
scoreDto1.setApprovalId(scoreDto.getApprovalId());
scoreDto1.setApprovalName(scoreDto.getApprovalName());
scoreDto1.setWeight(scoreDto.getWeight());
scoreDtos1.add(scoreDto1);
scores.remove(score);
isAdd = true;
break;
}
}
if(!isAdd){
ResultScoreDto scoreDto1 = new ResultScoreDto(); ResultScoreDto scoreDto1 = new ResultScoreDto();
BeanUtils.copyProperties(score, scoreDto1);
scoreDto1.setApprovalId(scoreDto.getApprovalId()); scoreDto1.setApprovalId(scoreDto.getApprovalId());
scoreDto1.setApprovalName(scoreDto.getApprovalName()); scoreDto1.setApprovalName(scoreDto.getApprovalName());
scoreDto1.setWeight(scoreDto.getWeight()); scoreDto1.setWeight(scoreDto.getWeight());
scoreDtos1.add(scoreDto1); scoreDtos1.add(scoreDto1);
scores.remove(score);
isAdd = true;
break;
} }
} }
if(!isAdd){ dto.setScoreDtos(scoreDtos1);
ResultScoreDto scoreDto1 = new ResultScoreDto(); }else{
scoreDto1.setApprovalId(scoreDto.getApprovalId()); dto.setScoreDtos(scoreDtos);
scoreDto1.setApprovalName(scoreDto.getApprovalName());
scoreDto1.setWeight(scoreDto.getWeight());
scoreDtos1.add(scoreDto1);
}
} }
dto.setScoreDtos(scoreDtos1);
}else{
dto.setScoreDtos(scoreDtos);
} }
} }
resultRecortModelDto.setDetailDtos(detailDtos); resultRecortModelDto.setDetailDtos(detailDtos);
resultRecortModelDtos.add(resultRecortModelDto); resultRecortModelDtos.add(resultRecortModelDto);
} }