ccsens_wiki
/
ccsenscloud
5
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
Browse Source

Merge branch 'tall3' of dd.tall.wiki:ccsens_wiki/ccsenscloud into tall3

tall3
zy_Java 4 years ago
parent
431ac63b47 68e7e3e35d
commit
1e16f0973e
1 changed files with 44 additions and 39 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 83
      common/src/main/java/com/ccsens/common/service/TaskService.java

83
common/src/main/java/com/ccsens/common/service/TaskService.java
View File

@ -195,20 +195,21 @@ public class TaskService implements ITaskService {
if (BooleanUtil.isFalse(isLook)) { if (BooleanUtil.isFalse(isLook)) {
throw new BaseException(CommonCodeError.NOT_PERMISSION); throw new BaseException(CommonCodeError.NOT_PERMISSION);
} }
//查询当前角色是否项目经理
List<Long> roleIds = new ArrayList<>(); List<Long> roleIds = new ArrayList<>();
List<CRoleVo.AllRole> roleList = roleDao.findAllRoleById(param.getRoleId()); roleIds.add(param.getRoleId());
if (CollectionUtil.isNotEmpty(roleList)){ //查询当前角色是否项目经理
List<CRoleVo.AllRole> roles = roleList.stream().filter(allRole -> allRole.getId().equals(param.getRoleId())).collect(Collectors.toList()); // List<CRoleVo.AllRole> roleList = roleDao.findAllRoleById(param.getRoleId());
if (CollectionUtil.isNotEmpty(roles)){ // if (CollectionUtil.isNotEmpty(roleList)){
if (Constant.ROLE_LEVEL.PM.value.equals(roles.get(0).getLevel())){ // List<CRoleVo.AllRole> roles = roleList.stream().filter(allRole -> allRole.getId().equals(param.getRoleId())).collect(Collectors.toList());
List<Long> allRoleId = roleList.stream().map(CRoleVo.AllRole::getId).collect(Collectors.toList()); // if (CollectionUtil.isNotEmpty(roles)){
roleIds.addAll(allRoleId); // if (Constant.ROLE_LEVEL.PM.value.equals(roles.get(0).getLevel())){
}else{ // List<Long> allRoleId = roleList.stream().map(CRoleVo.AllRole::getId).collect(Collectors.toList());
roleIds.add(param.getRoleId()); // roleIds.addAll(allRoleId);
} // }else{
} // roleIds.add(param.getRoleId());
} // }
// }
// }
List<CTaskVo.QueryTask> permanentGlobalTask = taskDetailDao.queryPermanentGlobalTask(roleIds); List<CTaskVo.QueryTask> permanentGlobalTask = taskDetailDao.queryPermanentGlobalTask(roleIds);
//查找项目面板和插件信息 //查找项目面板和插件信息
queryPluginForTask(permanentGlobalTask); queryPluginForTask(permanentGlobalTask);
@ -223,20 +224,22 @@ public class TaskService implements ITaskService {
if (BooleanUtil.isFalse(isLook)) { if (BooleanUtil.isFalse(isLook)) {
throw new BaseException(CommonCodeError.NOT_PERMISSION); throw new BaseException(CommonCodeError.NOT_PERMISSION);
} }
//查询当前角色是否项目经理
List<Long> roleIds = new ArrayList<>(); List<Long> roleIds = new ArrayList<>();
List<CRoleVo.AllRole> roleList = roleDao.findAllRoleById(param.getRoleId()); roleIds.add(param.getRoleId());
if (CollectionUtil.isNotEmpty(roleList)){ //查询当前角色是否项目经理
List<CRoleVo.AllRole> roles = roleList.stream().filter(allRole -> allRole.getId().equals(param.getRoleId())).collect(Collectors.toList()); // List<Long> roleIds = new ArrayList<>();
if (CollectionUtil.isNotEmpty(roles)){ // List<CRoleVo.AllRole> roleList = roleDao.findAllRoleById(param.getRoleId());
if (Constant.ROLE_LEVEL.PM.value.equals(roles.get(0).getLevel())){ // if (CollectionUtil.isNotEmpty(roleList)){
List<Long> allRoleId = roleList.stream().map(CRoleVo.AllRole::getId).collect(Collectors.toList()); // List<CRoleVo.AllRole> roles = roleList.stream().filter(allRole -> allRole.getId().equals(param.getRoleId())).collect(Collectors.toList());
roleIds.addAll(allRoleId); // if (CollectionUtil.isNotEmpty(roles)){
}else{ // if (Constant.ROLE_LEVEL.PM.value.equals(roles.get(0).getLevel())){
roleIds.add(param.getRoleId()); // List<Long> allRoleId = roleList.stream().map(CRoleVo.AllRole::getId).collect(Collectors.toList());
} // roleIds.addAll(allRoleId);
} // }else{
} // roleIds.add(param.getRoleId());
// }
// }
// }
List<CTaskVo.QueryTask> globalTask = taskDetailDao.queryGlobalTask(roleIds, param.getTimeNode(), param.getTimeUnit()); List<CTaskVo.QueryTask> globalTask = taskDetailDao.queryGlobalTask(roleIds, param.getTimeNode(), param.getTimeUnit());
queryPluginForTask(globalTask); queryPluginForTask(globalTask);
return globalTask; return globalTask;
@ -259,20 +262,22 @@ public class TaskService implements ITaskService {
if (BooleanUtil.isFalse(isLook)) { if (BooleanUtil.isFalse(isLook)) {
throw new BaseException(CommonCodeError.NOT_PERMISSION); throw new BaseException(CommonCodeError.NOT_PERMISSION);
} }
//查询当前角色是否项目经理
List<Long> roleIds = new ArrayList<>(); List<Long> roleIds = new ArrayList<>();
List<CRoleVo.AllRole> roleList = roleDao.findAllRoleById(param.getRoleId()); roleIds.add(param.getRoleId());
if (CollectionUtil.isNotEmpty(roleList)){ //查询当前角色是否项目经理
List<CRoleVo.AllRole> roles = roleList.stream().filter(allRole -> allRole.getId().equals(param.getRoleId())).collect(Collectors.toList()); // List<Long> roleIds = new ArrayList<>();
if (CollectionUtil.isNotEmpty(roles)){ // List<CRoleVo.AllRole> roleList = roleDao.findAllRoleById(param.getRoleId());
if (Constant.ROLE_LEVEL.PM.value.equals(roles.get(0).getLevel())){ // if (CollectionUtil.isNotEmpty(roleList)){
List<Long> allRoleId = roleList.stream().map(CRoleVo.AllRole::getId).collect(Collectors.toList()); // List<CRoleVo.AllRole> roles = roleList.stream().filter(allRole -> allRole.getId().equals(param.getRoleId())).collect(Collectors.toList());
roleIds.addAll(allRoleId); // if (CollectionUtil.isNotEmpty(roles)){
}else{ // if (Constant.ROLE_LEVEL.PM.value.equals(roles.get(0).getLevel())){
roleIds.add(param.getRoleId()); // List<Long> allRoleId = roleList.stream().map(CRoleVo.AllRole::getId).collect(Collectors.toList());
} // roleIds.addAll(allRoleId);
} // }else{
} // roleIds.add(param.getRoleId());
// }
// }
// }
//TODO 季度未实现 //TODO 季度未实现
List<CTaskVo.QueryTask> regularTask = taskDetailDao.queryRegularTask(roleIds, param.getTimeUnit(), param.getTimeNode(), param.getQueryType(), query, timeFormat); List<CTaskVo.QueryTask> regularTask = taskDetailDao.queryRegularTask(roleIds, param.getTimeUnit(), param.getTimeNode(), param.getQueryType(), query, timeFormat);
//如果该时段没有任务向上或向下补充 //如果该时段没有任务向上或向下补充

Write Preview
Loading…
Cancel
Save