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-06 09:23:27 +08:00
commit ec47988039
3 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -414,6 +414,9 @@ public class ResultRecordController extends AbstractController {
if(resultRecortModelDto.getWeight().compareTo(BigDecimal.ZERO) == 0){//不限权重的
resultRecortModelDto.setWeight(null);
}
if(resultRecortModelDto.getMaxCount().intValue() == 10000){//不限制数量
resultRecortModelDto.setMaxCount(null);
}
List<ResultDetailDto> detailDtos =
resultDetailService.selectDtosByRecordId(resultRecord.getId(), model.getType());
for (ResultDetailDto dto:detailDtos
@ -577,6 +580,9 @@ public class ResultRecordController extends AbstractController {
) {
int index = 0;
BigDecimal weight = BigDecimal.ZERO;
if(model.getMaxCount() != null && model.getDetailDtos().size() > model.getMaxCount().intValue()){
return R.error(model.getName() + "维度指标数量不能超过" + model.getMaxCount());
}
for (ResultDetailDto detailDto:model.getDetailDtos()
) {//排序
ResultDetail resultDetail = new ResultDetail();
@ -618,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){
return R.error(model.getName() + "的指标之和不能超过" + model.getWeight().multiply(BigDecimal.valueOf(100)) + "%");
}
}*/
}
//下面更新指标记录
if(inserts.size() > 0){

7
src/main/java/com/lz/modules/flow/service/impl/StaffRoleServiceImpl.java
View File

@ -371,12 +371,7 @@ public class StaffRoleServiceImpl extends ServiceImpl<StaffRoleMapper, StaffRole
List<EvaluationGroupInfo> evaluationGroupInfos = staffRoleEvaluationGroupService.selectStaffRoleEvaluationGroupBy(roleModel.getId());
info.setEvaluationGroupInfos(evaluationGroupInfos);
List<StaffMenu> all = staffMenuService.selectAll();
List<StaffMenu> roots = staffMenuService.selectByParentId(0l);
for (StaffMenu root : roots) {
getStaffMenuInfo(root, all);
}
info.setStaffMenuInfos(roots);
info.setStaffMenuInfos(all);
List<StaffMenu> staffMenus = staffRoleMenuService.selectByRoleId(staffRole.getId());
List<Long> selectStaffMenuInfos = new ArrayList<>();
for (StaffMenu staffMenu : staffMenus) {

4
src/main/java/com/lz/modules/performance/controller/FlowChartController.java
View File

@ -157,10 +157,14 @@ public class FlowChartController {
flowChartDetailRecord.setEvaluationGroupId(flowChartDetailRecordListReq.getEvaluationGroupId());
flowChartDetailRecord.setStepIndex(index);
if(flowChartDetailRecord.getStepType() == null){//添加时默认没有设置步骤类型，那么设置成一次
flowChartDetailRecord.setStepType(0);
}
flowChartDetailRecord.setStatus(flowChartDetailRecordListReq.getStatus());
if(flowChartDetailRecord.getId() != null && flowChartDetailRecord.getId().intValue() > 0){
updaes.add(flowChartDetailRecord);
}else{
inserts.add(flowChartDetailRecord);
}
if(flowChartDetailRecord.getIsDelete() == null || flowChartDetailRecord.getIsDelete().intValue() == 0){