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

Merge branch 'version_performance_2.0' of http://gitlab.ldxinyong.com/enterpriseManagement/lz_management into version_performance_2.0

Browse Source
This commit is contained in:
杜建超 2020-11-16 09:51:50 +08:00
commit bbb8222ab0
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/com/lz/modules/app/controller/ResultRecordController.java
View File

@ -417,7 +417,7 @@ public class ResultRecordController extends AbstractController {
resultScore.setWeight(record.getWeight());
}else{
//多人的时候权重平分
resultScore.setWeight(record.getWeight().divide(BigDecimal.valueOf(staffs1.size()), RoundingMode.CEILING));
resultScore.setWeight(record.getWeight().divide(BigDecimal.valueOf(staffs1.size()), RoundingMode.HALF_UP));
}
scoreDtos.add(resultScore);

4
src/main/java/com/lz/modules/flow/service/impl/FlowStartServiceImpl.java
View File

@ -189,8 +189,8 @@ public class FlowStartServiceImpl extends ServiceImpl<FlowStartMapper, FlowStart
log.info("未设置有效考核结束月份");
return R.error("未设置有效考核结束月份");
}
String endDate = sdf.format(flowStart.getStartTime());
flowStart.setName(startDate + "-" + endDate + "绩效考核");
String endDate = sdf.format(flowStart.getEndTime());
flowStart.setName(startDate + "至" + endDate + "绩效考核");
}else{
flowStart.setName(startDate + "绩效考核");
}