Ver Fonte

修复热门众测任务、项目排序问题

郭超 há 4 anos atrás
pai
commit
17771afb2d

+ 0 - 1
site/src/main/java/com/mooctest/crowd/site/service/impl/CrowdProjectServiceImpl.java

@@ -134,7 +134,6 @@ public class CrowdProjectServiceImpl implements CrowdProjectService {
 
         List<CrowdProjectVO> crowdProjectVOS = projectRepo.findAllHotProject().stream().map(crowdTestProject -> {
             // 领域、应用、测试类型值的转换
-//            crowdTestProject.setApplicationType(applicationMap.get(crowdTestProject.getApplicationType()));
             viewMediator.changeFieldAndApplicationAndTestType(crowdTestProject, applicationMap, fieldMap, testMap);
             // 判断项目是否截止
             if (crowdTestProject.getDeadTime().getTime() <= System.currentTimeMillis() && crowdTestProject.getStatus() < CrowdTestProjectStatus.HAS_FINISHED) {

+ 2 - 2
site/src/main/java/com/mooctest/crowd/site/service/impl/CrowdTaskServiceImpl.java

@@ -144,8 +144,8 @@ public class CrowdTaskServiceImpl implements CrowdTaskService {
         // 对结果进行排序 接收任务、任务状态、任务创建时间
         List<CrowdTaskVO> taskVOS;
         taskVOS = crowdTaskVOS.stream().filter(crowdTaskVO -> crowdTaskVO.getStatus() != CrowdTestTaskStatus.HAS_TIME_OUT)
-                .sorted(Comparator.comparing(CrowdTaskVO::getAcceptedCount).reversed()
-                        .thenComparing(CrowdTaskVO::getStatus).thenComparing(CrowdTaskVO::getCreateTime)).collect(Collectors.toList());
+                .sorted(Comparator.comparing(CrowdTaskVO::getAcceptedCount)
+                        .thenComparing(CrowdTaskVO::getStatus).thenComparing(CrowdTaskVO::getCreateTime).reversed()).collect(Collectors.toList());
 
         if(taskCount != 0){
             taskVOS = taskVOS.stream().limit(taskCount).collect(Collectors.toList());