Merge branch 'version_performance_2.0' of http://gitlab.ldxinyong.com/enterpriseManagement/lz_management into version_performance_2.0
This commit is contained in:
commit
bd60c3781c
@ -590,6 +590,7 @@ public class ResultRecordController extends AbstractController {
|
||||
}
|
||||
if(resultDetail.getIsDelete() == null || resultDetail.getIsDelete().intValue() == 0){
|
||||
BigDecimal score = BigDecimal.ZERO;
|
||||
if(detailDto.getScoreDtos() != null){
|
||||
for (ResultScoreDto scoreDto:detailDto.getScoreDtos()
|
||||
) {
|
||||
//计算得分
|
||||
@ -609,6 +610,8 @@ public class ResultRecordController extends AbstractController {
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
if(weight.compareTo(model.getWeight()) == 1){
|
||||
return R.error(model.getName() + "的指标之和不能超过" + model.getWeight().multiply(BigDecimal.valueOf(100)) + "%");
|
||||
}
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user