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 20:42:29 +08:00
parent a4e336765d
commit 73889446fd
1 changed files with 19 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -217,7 +217,7 @@ public class FlowStartServiceImpl extends ServiceImpl<FlowStartMapper, FlowStart
}).collect(Collectors.toList()); }).collect(Collectors.toList());
Map<String, String> maps = ids1.stream().collect(Collectors.toMap(e->e, e->e)); Map<String, String> maps = ids1.stream().collect(Collectors.toMap(e->e, e->e));
//求差集发起，但是历史记录怎么搞
List<String> ids= Arrays.stream(flowStart.getGroupIds().split(",")).map(new Function<String, String>() { List<String> ids= Arrays.stream(flowStart.getGroupIds().split(",")).map(new Function<String, String>() {
@Override @Override
public String apply(String s) { public String apply(String s) {
@ -233,10 +233,17 @@ public class FlowStartServiceImpl extends ServiceImpl<FlowStartMapper, FlowStart
i++; i++;
} }
if(ids.size() == 0){ if(ids.size() == 0){
return R.ok("发起成功，该任务已经发起过") /*return R.ok("发起成功，该任务已经发起过")
.put("data", flowStart1); .put("data", flowStart1);*/
} log.info("可能会使用历史数模板数据");
flowStart.setId(flowStart1.getId());
flowStart.setIsDelete(flowStart1.getIsDelete());
}else{
log.info("有新增组");
ids1.addAll(ids); ids1.addAll(ids);
flowStart1.setGroupIds(ids1.stream().collect(Collectors.joining(",")));//把新的组信息加入 flowStart1.setGroupIds(ids1.stream().collect(Collectors.joining(",")));//把新的组信息加入
updateFlowStartById(flowStart1);//更新组信息到记录里面 updateFlowStartById(flowStart1);//更新组信息到记录里面
@ -245,6 +252,7 @@ public class FlowStartServiceImpl extends ServiceImpl<FlowStartMapper, FlowStart
flowStart.setId(flowStart1.getId()); flowStart.setId(flowStart1.getId());
flowStart.setIsDelete(flowStart1.getIsDelete()); flowStart.setIsDelete(flowStart1.getIsDelete());
} }
}
Map<String, List<StaffEntity>> staffManages = new HashedMap();//部门(id+几级)和部门几级管理对应关系，减少数据库查找 Map<String, List<StaffEntity>> staffManages = new HashedMap();//部门(id+几级)和部门几级管理对应关系，减少数据库查找