任务、项目排序

site/src/main/java/com/mooctest/crowd/site/command/CrowdTestTaskCommand.java

@@ -71,6 +71,7 @@ public class CrowdTestTaskCommand {
     public CrowdTestTask toCrowdTask(String projectCode){
         CrowdTestTask task = toCrowdTask();
         task.setCrowdTestProjectCode(projectCode);
+        task.setCreateTime(new Timestamp(System.currentTimeMillis()));
         return task;
     }
 }

site/src/main/java/com/mooctest/crowd/site/mediator/impl/WebMediatorImpl.java

@@ -7,6 +7,7 @@ import com.mooctest.crowd.domain.exception.CrowdTestReportNotExistException;
 import com.mooctest.crowd.domain.exception.CrowdTestTaskNotExistException;
 import com.mooctest.crowd.domain.factory.CrowdTestProjectFactory;
 import com.mooctest.crowd.domain.model.CrowdTestProjectPO;
+import com.mooctest.crowd.domain.model.CrowdTestTaskPO;
 import com.mooctest.crowd.domain.model.EvaluationAgencyPO;
 import com.mooctest.crowd.domain.model.UserPO;
 import com.mooctest.crowd.domain.repository.CrowdTestProjectRepo;
@@ -122,13 +123,14 @@ public class WebMediatorImpl implements ViewMediator {
         //我的众测 - 项目相关信息
         //获取我创建的项目列表
         List<CrowdProjectVO> myProejcts = projectDao.findByUserIdAndIsDeleted(userId, DeletedStatus.isNotDeleted)
-                .stream().map(crowdTestProjectPO -> {
+                .stream().sorted(Comparator.comparing(CrowdTestProjectPO::getCreateTime).thenComparing(CrowdTestProjectPO::getStatus).reversed()).map(crowdTestProjectPO -> {
                             CrowdTestProject project = new CrowdTestProject();
                             BeanUtils.copyProperties(crowdTestProjectPO, project);
                             return new CrowdProjectVO(project);}).collect(Collectors.toList());
         //对于区域管理员
         if (user.getRoleList().stream().anyMatch(role -> role.getName().equals("RegionalManager"))){
-            List<CrowdTestProjectPO> crowdTestProjectPOList = projectDao.findByRegionalManagerIdAndIsDeleted(userId, DeletedStatus.isNotDeleted);
+            List<CrowdTestProjectPO> crowdTestProjectPOList = projectDao.findByRegionalManagerIdAndIsDeleted(userId, DeletedStatus.isNotDeleted)
+                    .stream().sorted(Comparator.comparing(CrowdTestProjectPO::getCreateTime).reversed().thenComparing(CrowdTestProjectPO::getStatus).reversed()).collect(Collectors.toList());
             //获取区域管理员正在处理中的项目列表
             myCrowdDTO.setHandlingProjects(crowdTestProjectPOList.stream().filter(crowdTestProjectPO -> crowdTestProjectPO.getStatus()>CrowdTestProjectStatus.HAS_RELEASED).map(crowdTestProjectPO -> {
                 CrowdTestProject project = new CrowdTestProject();
@@ -159,6 +161,7 @@ public class WebMediatorImpl implements ViewMediator {
         List<CrowdTaskVO> finishedTasks = null;
         if (user.getRoleList().stream().anyMatch(role -> role.getName().equals("evaluationAgency"))) {
             allTaskOfAgency = taskDao.findByEvaluationAgencyIdAndIsDeleted(user.getEvaluationAgency().getUserId(), 0).stream()
+                    .sorted(Comparator.comparing(CrowdTestTaskPO::getId).reversed().thenComparing(CrowdTestTaskPO::getStatus).reversed())
                     .map(crowdTestTaskPO -> {
                         CrowdTestTask task = new CrowdTestTask();
                         BeanUtils.copyProperties(crowdTestTaskPO, task);