|
@@ -130,7 +130,7 @@ public class WebMediatorImpl implements ViewMediator {
|
|
|
if (user.getRegionalManager() != null){
|
|
if (user.getRegionalManager() != null){
|
|
|
List<CrowdTestProjectPO> crowdTestProjectPOList = projectDao.findByRegionalManagerIdAndIsDeleted(userId, DeletedStatus.isNotDeleted);
|
|
List<CrowdTestProjectPO> crowdTestProjectPOList = projectDao.findByRegionalManagerIdAndIsDeleted(userId, DeletedStatus.isNotDeleted);
|
|
|
//获取区域管理员正在处理中的项目列表
|
|
//获取区域管理员正在处理中的项目列表
|
|
|
- myCrowdDTO.setHandlingProjects(crowdTestProjectPOList.stream().filter(crowdTestProjectPO -> crowdTestProjectPO.getStatus()>CrowdTestProjectStatus.HAS_RECEIVED).map(crowdTestProjectPO -> {
|
|
|
|
|
|
|
+ myCrowdDTO.setHandlingProjects(crowdTestProjectPOList.stream().filter(crowdTestProjectPO -> crowdTestProjectPO.getStatus()>CrowdTestProjectStatus.HAS_RELEASED).map(crowdTestProjectPO -> {
|
|
|
CrowdTestProject project = new CrowdTestProject();
|
|
CrowdTestProject project = new CrowdTestProject();
|
|
|
BeanUtils.copyProperties(crowdTestProjectPO, project);
|
|
BeanUtils.copyProperties(crowdTestProjectPO, project);
|
|
|
return new CrowdProjectVO(project); }).collect(Collectors.toList()));
|
|
return new CrowdProjectVO(project); }).collect(Collectors.toList()));
|
|
@@ -165,7 +165,7 @@ public class WebMediatorImpl implements ViewMediator {
|
|
|
return task;
|
|
return task;
|
|
|
}).collect(Collectors.toList());
|
|
}).collect(Collectors.toList());
|
|
|
unfinishedTasks = allTaskOfAgency.stream()
|
|
unfinishedTasks = allTaskOfAgency.stream()
|
|
|
- .filter(crowdTestTask -> crowdTestTask.getStatus()>=CrowdTestTaskStatus.HAS_RECEIVED && crowdTestTask.getStatus()<CrowdTestTaskStatus.HAS_FINISHED)
|
|
|
|
|
|
|
+ .filter(crowdTestTask -> crowdTestTask.getStatus()>=CrowdTestTaskStatus.HAS_RELEASED && crowdTestTask.getStatus()<CrowdTestTaskStatus.HAS_FINISHED)
|
|
|
.map(CrowdTaskVO::new).collect(Collectors.toList());
|
|
.map(CrowdTaskVO::new).collect(Collectors.toList());
|
|
|
finishedTasks = allTaskOfAgency.stream()
|
|
finishedTasks = allTaskOfAgency.stream()
|
|
|
.filter(crowdTestTask -> crowdTestTask.getStatus()==CrowdTestTaskStatus.HAS_FINISHED)
|
|
.filter(crowdTestTask -> crowdTestTask.getStatus()==CrowdTestTaskStatus.HAS_FINISHED)
|