郭超 %!s(int64=4) %!d(string=hai) anos
pai
achega
c63d08f600

+ 1 - 1
core/src/main/java/com/mooctest/crowd/domain/dao/CrowdTestProjectDao.java

@@ -47,7 +47,7 @@ public interface CrowdTestProjectDao extends CrudRepository<CrowdTestProjectPO,
     List<CrowdTestProjectPO> findHotProjectCardLimitCount(int projectCount);
 
     //更多热门项目
-    @Query(value = "SELECT * FROM crowd_test_project p WHERE CTP_STATUS !=4 and CTP_STATUS !=5 and CTP_PDT_ID != 0 and CTP_IS_DELETED = 0 ORDER BY CTP_JOIN_COUNT DESC ,CTP_STATUS ASC, CTP_CREATE_TIME DESC; ", nativeQuery = true)
+    @Query(value = "SELECT * FROM crowd_test_project p WHERE CTP_STATUS !=4 and CTP_STATUS !=5 and CTP_IS_DELETED = 0 ORDER BY CTP_JOIN_COUNT DESC ,CTP_STATUS ASC, CTP_CREATE_TIME DESC; ", nativeQuery = true)
     List<CrowdTestProjectPO> findAllHotProject();
 
     CrowdTestProjectPO findByIdAndIsDeleted(Long id, int isDeleted);

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

@@ -132,7 +132,10 @@ public class CrowdProjectServiceImpl implements CrowdProjectService {
         Map<String, String> applicationMap = commonRepo.getApplicationCodeNameMap();
         Map<String, String> testMap = commonRepo.getTypeCodeNameMap();
 
-        List<CrowdProjectVO> crowdProjectVOS = projectRepo.findAllHotProject().stream().map(crowdTestProject -> {
+        // 过滤定向项目
+        List<CrowdProjectVO> crowdProjectVOS = projectRepo.findAllHotProject().stream()
+                .filter(crowdTestProject -> !crowdTestProject.getProjectDistributionTypeId().equals(DistributeType.DIRECT.getId()))
+                .map(crowdTestProject -> {
             // 领域、应用、测试类型值的转换
             viewMediator.changeFieldAndApplicationAndTestType(crowdTestProject, applicationMap, fieldMap, testMap);
             // 判断项目是否截止

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

@@ -141,9 +141,10 @@ public class CrowdTaskServiceImpl implements CrowdTaskService {
         if (!testTypeCode.equals("")){
             crowdTaskVOS = crowdTaskVOS.stream().filter(crowdTaskVO -> crowdTaskVO.getServiceType().equals(testMap.get(testTypeCode))).collect(Collectors.toList());
         }
-        // 对结果进行排序 接收任务、任务状态、任务创建时间
+        // 过滤定向任务,并对结果进行排序 接收任务、任务状态、任务创建时间
         List<CrowdTaskVO> taskVOS;
         taskVOS = crowdTaskVOS.stream().filter(crowdTaskVO -> crowdTaskVO.getStatus() != CrowdTestTaskStatus.HAS_TIME_OUT)
+                .filter(crowdTaskVO -> !crowdTaskVO.getDistributionType().equals(DistributeType.DIRECT.getId()))
                 .sorted(Comparator.comparing(CrowdTaskVO::getAcceptedCount)
                         .thenComparing(CrowdTaskVO::getStatus).thenComparing(CrowdTaskVO::getCreateTime).reversed()).collect(Collectors.toList());