保存绩效详情页去掉对权重之和的限制
This commit is contained in:
parent
ac012346ec
commit
4decad63c1
@ -581,7 +581,7 @@ public class ResultRecordController extends AbstractController {
|
|||||||
int index = 0;
|
int index = 0;
|
||||||
BigDecimal weight = BigDecimal.ZERO;
|
BigDecimal weight = BigDecimal.ZERO;
|
||||||
if(model.getDetailDtos().size() > model.getMaxCount().intValue()){
|
if(model.getDetailDtos().size() > model.getMaxCount().intValue()){
|
||||||
return R.error(model.getName() + "维度指标不能超过" + model.getMaxCount());
|
return R.error(model.getName() + "维度指标数量不能超过" + model.getMaxCount());
|
||||||
}
|
}
|
||||||
for (ResultDetailDto detailDto:model.getDetailDtos()
|
for (ResultDetailDto detailDto:model.getDetailDtos()
|
||||||
) {//排序
|
) {//排序
|
||||||
@ -624,10 +624,10 @@ public class ResultRecordController extends AbstractController {
|
|||||||
|
|
||||||
}
|
}
|
||||||
//下面不限权重的,计算权重之和是否超标
|
//下面不限权重的,计算权重之和是否超标
|
||||||
if(model.getWeight() != null && model.getWeight().compareTo(BigDecimal.ZERO) != 0
|
/*if(model.getWeight() != null && model.getWeight().compareTo(BigDecimal.ZERO) != 0
|
||||||
&& weight.compareTo(model.getWeight()) == 1){
|
&& 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)) + "%");
|
||||||
}
|
}*/
|
||||||
}
|
}
|
||||||
//下面更新指标记录
|
//下面更新指标记录
|
||||||
if(inserts.size() > 0){
|
if(inserts.size() > 0){
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user