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

提交修改

Browse Source
This commit is contained in:
quyixiao 2020-08-26 09:48:45 +08:00
parent a9122bf56a
commit 253c51a170
1 changed files with 1 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/main/java/com/lz/modules/sys/service/app/impl/ResultRecordServiceImpl.java
View File

@ -77,9 +77,6 @@ public class ResultRecordServiceImpl extends ServiceImpl<ResultRecordMapper, Res
@Autowired @Autowired
private RecordAuthService recordAuthService; private RecordAuthService recordAuthService;
@Autowired @Autowired
private FlowRelationService flowRelationService; private FlowRelationService flowRelationService;
@ -103,8 +100,6 @@ public class ResultRecordServiceImpl extends ServiceImpl<ResultRecordMapper, Res
private ResultDetailService resultDetailService; private ResultDetailService resultDetailService;
@Override @Override
public ResultRecord selectResultRecordById(Long id) { public ResultRecord selectResultRecordById(Long id) {
return resultRecordMapper.selectResultRecordById(id); return resultRecordMapper.selectResultRecordById(id);
@ -169,7 +164,6 @@ public class ResultRecordServiceImpl extends ServiceImpl<ResultRecordMapper, Res
params.setStatusList(listx); params.setStatusList(listx);
} }
} }
params.setDepartmentIds(departmentIds); params.setDepartmentIds(departmentIds);
String departmentLevel = Constant.ME; String departmentLevel = Constant.ME;
if (params.getIsSelf() != 1) { // 表示点击我们审批 if (params.getIsSelf() != 1) { // 表示点击我们审批
@ -330,7 +324,7 @@ public class ResultRecordServiceImpl extends ServiceImpl<ResultRecordMapper, Res
if (CollectionUtils.isEmpty(resultDetails)) { if (CollectionUtils.isEmpty(resultDetails)) {
return R.error("请先添加业绩"); 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) { if (sum < 0.7) {
return R.error("recordId为[" + recordId + "]业绩权重之和必需大于0.7"); return R.error("recordId为[" + recordId + "]业绩权重之和必需大于0.7");
} }