提交修改
This commit is contained in:
parent
a9122bf56a
commit
253c51a170
@ -77,9 +77,6 @@ public class ResultRecordServiceImpl extends ServiceImpl<ResultRecordMapper, Res
|
||||
@Autowired
|
||||
private RecordAuthService recordAuthService;
|
||||
|
||||
|
||||
|
||||
|
||||
@Autowired
|
||||
private FlowRelationService flowRelationService;
|
||||
|
||||
@ -103,8 +100,6 @@ public class ResultRecordServiceImpl extends ServiceImpl<ResultRecordMapper, Res
|
||||
private ResultDetailService resultDetailService;
|
||||
|
||||
|
||||
|
||||
|
||||
@Override
|
||||
public ResultRecord selectResultRecordById(Long id) {
|
||||
return resultRecordMapper.selectResultRecordById(id);
|
||||
@ -169,7 +164,6 @@ public class ResultRecordServiceImpl extends ServiceImpl<ResultRecordMapper, Res
|
||||
params.setStatusList(listx);
|
||||
}
|
||||
}
|
||||
|
||||
params.setDepartmentIds(departmentIds);
|
||||
String departmentLevel = Constant.ME;
|
||||
if (params.getIsSelf() != 1) { // 表示点击我们审批
|
||||
@ -330,7 +324,7 @@ public class ResultRecordServiceImpl extends ServiceImpl<ResultRecordMapper, Res
|
||||
if (CollectionUtils.isEmpty(resultDetails)) {
|
||||
return R.error("请先添加业绩");
|
||||
}
|
||||
double sum = resultDetails.stream().filter(p -> p.getType() == 2).mapToDouble(p -> NumberUtil.objToDoubleWithDefault(p.getCheckWeight(), 0d)).sum();
|
||||
double sum = resultDetails.stream().filter(p -> p.getType() == 1).mapToDouble(p -> NumberUtil.objToDoubleWithDefault(p.getCheckWeight(), 0d)).sum();
|
||||
if (sum < 0.7) {
|
||||
return R.error("recordId为[" + recordId + "]业绩权重之和必需大于0.7");
|
||||
}
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user