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-19 18:56:38 +08:00
parent 054c991aea
commit 4fd958c721
1 changed files with 14 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
src/main/java/com/lz/modules/flow/service/impl/ResultModelServiceImpl.java
View File

@ -129,7 +129,20 @@ public class ResultModelServiceImpl extends ServiceImpl<ResultModelMapper, Resul
resultModel.setGradeStatus(resultModelDetailReq.getGradeStatus()); resultModel.setGradeStatus(resultModelDetailReq.getGradeStatus());
resultModel.setEvaluationGroupId(resultModelDetailReq.getEvaluationGroupId()); resultModel.setEvaluationGroupId(resultModelDetailReq.getEvaluationGroupId());
resultModel.setOrderBy(resultModelOrderBy); resultModel.setOrderBy(resultModelOrderBy);
if(resultModel.getWeight() == null){
resultModel.setWeight(BigDecimal.ZERO);
}
if(resultModel.getId() == null){
resultModelMapper.insertResultModel(resultModel);
}else{
resultModelMapper.updateResultModelById(resultModel);
if(resultModel.getIsDelete() != null && resultModel.getIsDelete().intValue() == 1){
delCount--;
}
}
if(itemReq.getTagetLibItems() != null){ if(itemReq.getTagetLibItems() != null){
int libOrderBy = 0; int libOrderBy = 0;
List<ResultTagetLib> inserts = new ArrayList<>(); List<ResultTagetLib> inserts = new ArrayList<>();
@ -143,7 +156,7 @@ public class ResultModelServiceImpl extends ServiceImpl<ResultModelMapper, Resul
resultTagetLib.setOrderBy(libOrderBy); resultTagetLib.setOrderBy(libOrderBy);
if(req.getWeight() != null){ if(req.getWeight() != null){
tagLibWeight = tagLibWeight.add(req.getWeight()); tagLibWeight = tagLibWeight.add(req.getWeight());
if(resultModel.getWeight() != null && tagLibWeight.compareTo(resultModel.getWeight()) == 1){ if(!resultModel.getWeight().equals(BigDecimal.ZERO) && tagLibWeight.compareTo(resultModel.getWeight()) == 1){
TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();//事务回滚 TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();//事务回滚
return R.error(resultModel.getName() + return R.error(resultModel.getName() +
"维度的指标之和不能大于" + (resultModel.getWeight().multiply(BigDecimal.valueOf(100))) + "%"); "维度的指标之和不能大于" + (resultModel.getWeight().multiply(BigDecimal.valueOf(100))) + "%");
@ -171,18 +184,6 @@ public class ResultModelServiceImpl extends ServiceImpl<ResultModelMapper, Resul
resultModelOrderBy++; resultModelOrderBy++;
} }
} }
if(resultModel.getId() == null){
resultModelMapper.insertResultModel(resultModel);
}else{
if(resultModel.getWeight() == null){
resultModel.setWeight(BigDecimal.ZERO);
}
resultModelMapper.updateResultModelById(resultModel);
if(resultModel.getIsDelete() != null && resultModel.getIsDelete().intValue() == 1){
delCount--;
}
}
} }
/*if(delCount == 0){ /*if(delCount == 0){