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-11-03 16:25:20 +08:00
parent b11e3af70d
commit 4c4dd882da
1 changed files with 21 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -334,9 +334,18 @@ public class FlowStartServiceImpl extends ServiceImpl<FlowStartMapper, FlowStart
} }
if(flowChartDetailRecord.getOptType().intValue() == ChartOptType.APPOINT.getCode()){//指定人员的 if(flowChartDetailRecord.getOptType().intValue() == ChartOptType.APPOINT.getCode()){//指定人员的
String roles = null;
if(flowChartRoles != null && flowChartRoles.size() > 0){//
roles = flowChartRoles.stream().map(new Function<FlowChartRole, String>() {
@Override
public String apply(FlowChartRole flowChartRole) {
return flowChartRole.getRoleId().toString();
}
}).collect(Collectors.joining(","));
}
String[] optIds = flowChartDetailRecord.getOptIds().split(","); String[] optIds = flowChartDetailRecord.getOptIds().split(",");
@ -352,24 +361,21 @@ public class FlowStartServiceImpl extends ServiceImpl<FlowStartMapper, FlowStart
flowApprovalRole.setType(flowChartDetailRecord.getOptType()); flowApprovalRole.setType(flowChartDetailRecord.getOptType());
flowApprovalRoles.add(flowApprovalRole); flowApprovalRoles.add(flowApprovalRole);
flowApprovalRole.setStepIndex(stepIndex); flowApprovalRole.setStepIndex(stepIndex);
if(flowChartDetailRecord.getStepType().intValue() == 0){ if(roles != null){
//依次
stepIndex++;
}
if(flowChartRoles != null && flowChartRoles.size() > 0){//设置必备权限
String roles = flowChartRoles.stream().map(new Function<FlowChartRole, String>() {
@Override
public String apply(FlowChartRole flowChartRole) {
return flowChartRole.getRoleId().toString();
}
}).collect(Collectors.joining(","));
if(flowApprovalRole.getRoleId() == null || flowApprovalRole.getRoleId().length() == 0){ if(flowApprovalRole.getRoleId() == null || flowApprovalRole.getRoleId().length() == 0){
flowApprovalRole.setRoleId(roles); flowApprovalRole.setRoleId(roles);
}else{ }else{
flowApprovalRole.setRoleId(flowApprovalRole.getRoleId() + "," + roles); flowApprovalRole.setRoleId(flowApprovalRole.getRoleId() + "," + roles);
} }
} }
if(flowChartDetailRecord.getStepType().intValue() == 0){
//依次
stepIndex++;
}
} }
//stepIndex++; //stepIndex++;
if(flowApprovalRole != null){ if(flowApprovalRole != null){
@ -377,7 +383,7 @@ public class FlowStartServiceImpl extends ServiceImpl<FlowStartMapper, FlowStart
} }
}else{ }else{
if(flowChartDetailRecord.getOptType().intValue() == ChartOptType.SELF.getCode()) {//指定人员的 if(flowChartDetailRecord.getOptType().intValue() == ChartOptType.SELF.getCode()) {//参与人员为自己的
//获取被考核人的必备权限 //获取被考核人的必备权限
if (selfMustRole.containsKey(flow.getChartId())) { if (selfMustRole.containsKey(flow.getChartId())) {
flowChartRoles.addAll(selfMustRole.get(flow.getChartId())); flowChartRoles.addAll(selfMustRole.get(flow.getChartId()));
@ -396,7 +402,7 @@ public class FlowStartServiceImpl extends ServiceImpl<FlowStartMapper, FlowStart
flowApprovalRoles.add(flowApprovalRole); flowApprovalRoles.add(flowApprovalRole);
flowApprovalRole.setStepIndex(stepIndex); flowApprovalRole.setStepIndex(stepIndex);
if(flowChartRoles != null && flowChartRoles.size() > 0){//设置必备权限 if(flowChartRoles != null && flowChartRoles.size() > 0){//
String roles = flowChartRoles.stream().map(new Function<FlowChartRole, String>() { String roles = flowChartRoles.stream().map(new Function<FlowChartRole, String>() {
@Override @Override
public String apply(FlowChartRole flowChartRole) { public String apply(FlowChartRole flowChartRole) {