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

Merge branch 'version_performance_2.0' of http://gitlab.ldxinyong.com/enterpriseManagement/lz_management into version_performance_2.0

Browse Source
This commit is contained in:
杜建超 2020-10-30 15:01:39 +08:00
commit bd60c3781c
1 changed files with 18 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/main/java/com/lz/modules/app/controller/ResultRecordController.java
View File

@ -590,6 +590,7 @@ public class ResultRecordController extends AbstractController {
} }
if(resultDetail.getIsDelete() == null || resultDetail.getIsDelete().intValue() == 0){ if(resultDetail.getIsDelete() == null || resultDetail.getIsDelete().intValue() == 0){
BigDecimal score = BigDecimal.ZERO; BigDecimal score = BigDecimal.ZERO;
if(detailDto.getScoreDtos() != null){
for (ResultScoreDto scoreDto:detailDto.getScoreDtos() for (ResultScoreDto scoreDto:detailDto.getScoreDtos()
) { ) {
//计算得分 //计算得分
@ -609,6 +610,8 @@ public class ResultRecordController extends AbstractController {
} }
} }
}
if(weight.compareTo(model.getWeight()) == 1){ if(weight.compareTo(model.getWeight()) == 1){
return R.error(model.getName() + "的指标之和不能超过" + model.getWeight().multiply(BigDecimal.valueOf(100)) + "%"); return R.error(model.getName() + "的指标之和不能超过" + model.getWeight().multiply(BigDecimal.valueOf(100)) + "%");
} }