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-12-18 16:13:37 +08:00
parent 14035c148d
commit 9972a921b3
1 changed files with 23 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -473,32 +473,48 @@ public class ResultRecordController extends AbstractController {
List<StaffEntity> staffs = new ArrayList<>(); List<StaffEntity> staffs = new ArrayList<>();
Boolean isAllScore = true;//false表示返回所有的评分，true表示值返回评分了的人 Boolean isAllScore = true;//false表示返回所有的评分，true表示值返回评分了的人
Boolean isOrScore = false;//是否为或签 Boolean isOrScore = false;//是否为或签
int staffIndex = 0;
for (FlowChartDetailRecord record:flowChartDetailRecords for (FlowChartDetailRecord record:flowChartDetailRecords
) { ) {
List<StaffEntity> staffs1 = new ArrayList<>(); List<StaffEntity> staffs1 = new ArrayList<>();
if(record.getOptType().intValue() == -1){ if(record.getOptType().intValue() == -1){
//自己 //自己
StaffEntity staffEntity = new StaffEntity(); StaffEntity staffEntity = new StaffEntity();
staffEntity.setId(resultRecord.getStaffId()); staffEntity.setId(flowRecords1.get(staffIndex).getApprovalStaffId());
staffEntity.setName(resultRecord.getStaffName()); staffEntity.setName(flowRecords1.get(staffIndex).getApprovalStaffName());
staffs1.add(staffEntity); staffs1.add(staffEntity);
staffIndex++;
}else if(record.getOptType().intValue() == 0){ }else if(record.getOptType().intValue() == 0){
//指定人员 //指定人员
//获取人员信息 //获取人员信息
List<Long> sIds = Arrays.stream(record.getOptIds().split(",")).map(new Function<String, Long>() { int size = record.getOptIds().split(",").length;
List<Long> sIds = new ArrayList<>();
for(int i =0; i < size; i++){
StaffEntity staffEntity = new StaffEntity();
staffEntity.setId(flowRecords1.get(staffIndex).getApprovalStaffId());
staffEntity.setName(flowRecords1.get(staffIndex).getApprovalStaffName());
staffs1.add(staffEntity);
staffIndex++;
}
/*List<Long> sIds = Arrays.stream(record.getOptIds().split(",")).map(new Function<String, Long>() {
@Override @Override
public Long apply(String s) { public Long apply(String s) {
return Long.parseLong(s); return Long.parseLong(s);
} }
}).collect(Collectors.toList()); }).collect(Collectors.toList());
staffs1.addAll(staffService.selectNamesByIds(sIds));//这里不过滤离职人员，因为过滤了可能涉及到评分规则的变更 staffs1.addAll(staffService.selectNamesByIds(sIds));//这里不过滤离职人员，因为过滤了可能涉及到评分规则的变更*/
}else{ }else{//暂时不支持多个领导吧
//领导 //领导
DepartManagers departManagers = staffService.findLeader(resultRecord.getStaffId(), record.getOptType()); /*DepartManagers departManagers = staffService.findLeader(resultRecord.getStaffId(), record.getOptType());
if(departManagers.getManagers().size() > 0){ if(departManagers.getManagers().size() > 0){
staffs1.addAll(departManagers.getManagers()); staffs1.addAll(departManagers.getManagers());
} }*/
StaffEntity staffEntity = new StaffEntity();
staffEntity.setId(flowRecords1.get(staffIndex).getApprovalStaffId());
staffEntity.setName(flowRecords1.get(staffIndex).getApprovalStaffName());
staffs1.add(staffEntity);
staffIndex++;
} }
if(staffs1.size() == 0){ if(staffs1.size() == 0){
log.info("无法找到评分人员，开始找绩效管理人员"); log.info("无法找到评分人员，开始找绩效管理人员");