修正信创广场上获取项目和任务的接口

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

@@ -34,6 +34,10 @@ public interface CrowdTestProjectDao extends CrudRepository<CrowdTestProjectPO,
     @Query(value = "SELECT * FROM crowd_test_project p WHERE CTP_STATUS = 1 and CTP_PDT_ID = 2 and CTP_IS_DELETED = 0 ORDER BY CTP_CREATE_TIME DESC", nativeQuery = true)
     List<CrowdTestProjectPO> findAll();
 
+    //广场查找项目
+    @Query(value = "SELECT * FROM crowd_test_project p WHERE CTP_STATUS = 1 and CTP_PDT_ID = 2 and CTP_NAME LIKE ?1 and CTP_IS_DELETED = 0 ORDER BY CTP_CREATE_TIME DESC", nativeQuery = true)
+    List<CrowdTestProjectPO> findWaitingAcceptByNameLike(String name);
+
     //这个指定了查询条数 适用于众测广场首页
     @Query(value = "SELECT * FROM crowd_test_project p WHERE CTP_STATUS =1 and CTP_PDT_ID = 2 and CTP_IS_DELETED = 0 ORDER BY CTP_CREATE_TIME DESC LIMIT ?1", nativeQuery = true)
     List<CrowdTestProjectPO> findSquareIndexProject(int indexCount);
@@ -42,6 +46,7 @@ public interface CrowdTestProjectDao extends CrudRepository<CrowdTestProjectPO,
     @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_CREATE_TIME LIMIT ?1 ", nativeQuery = true)
     List<CrowdTestProjectPO> findHotProjectCardLimitCount(int projectCount);
 
+    //更多热门项目
     @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();
 

core/src/main/java/com/mooctest/crowd/domain/repository/CrowdTestProjectRepo.java

@@ -444,6 +444,10 @@ public class CrowdTestProjectRepo implements ICrowdTestProjectRepo {
         return crowdTestProjectListResult;
     }
 
+    public List<CrowdTestProject> findWaitingAcceptByNameLike(String name){
+        return crowdTestProjectDao.findWaitingAcceptByNameLike(name).stream().map(projectPO -> Converter.convert(CrowdTestProject.class, projectPO)).collect(Collectors.toList());
+    }
+
     public List<CrowdTestProject> findSquareIndexProject(int indexCount){
         return crowdTestProjectDao.findSquareIndexProject(indexCount).stream().map(projectPO -> Converter.convert(CrowdTestProject.class, projectPO)).collect(Collectors.toList());
     }

site/src/main/java/com/mooctest/crowd/site/controller/CrowTestSquareController.java

@@ -38,48 +38,74 @@ public class CrowTestSquareController extends BaseSearchController {
     @Autowired
     private CrowdTestSquareService crowdTestSquareService;
 
-    @Value("${square.task.count}")
-    private int taskCount;
+    @Value("${square.count.index.project}")
+    private int indexProjectCount;
 
-    @Value("${square.project.count}")
-    private int projectCount;
+    @Value("${square.count.index.task}")
+    private int indexTaskCount;
 
-    @Value("${square.index.count}")
-    private int indexCount;
+    @Value("${square.count.card.project}")
+    private int cardProjectCount;
+
+    @Value("${square.count.card.task}")
+    private int cardTaskCount;
+
+    @Value("${square.count.show.project}")
+    private int showProjectCount;
+
+    @Value("${square.count.show.task}")
+    private int showTaskCount;
 
     /**
-     * 获取众测广场首页所有的数据,包装到CrowdTestSquareIndexDTO里面*
+     * 获取众测广场首页任务和项目最多各indexCount个（6个），按照创建时间排序*
      *
      * @return
      */
     @GetMapping("/list")
     public ResponseVO getAll() {
         CrowdTestSquareIndexDTO crowdTestSquareIndexDTO = new CrowdTestSquareIndexDTO();
-        crowdTestSquareIndexDTO.setCrowdTestProjectVOs(crowdProjectService.findIndexProjectLimitCount(indexCount));//众测项目
-        crowdTestSquareIndexDTO.setCrowdTestTaskVOS(crowdTaskService.findIndexTaskLimitCount(indexCount));//众测任务
-//        crowdTestSquareIndexDTO.setHotCrowdTaskVOs(crowdTaskService.findMoreHotTasksList("", taskCount));//热门任务
-//        crowdTestSquareIndexDTO.setHotCrowdTestProjectVOs(crowdProjectService.findHotProjectCardLimitCount());//热门项目
+        crowdTestSquareIndexDTO.setCrowdTestProjectVOs(crowdProjectService.findIndexProjectLimitCount(indexProjectCount));//众测项目
+        crowdTestSquareIndexDTO.setCrowdTestTaskVOS(crowdTaskService.findWaitingAcceptByNameLike(indexTaskCount, "", ""));//众测任务
+        return new ResponseVO(ServerCode.SUCCESS, crowdTestSquareIndexDTO);
+    }
+
+    /**
+     * 搜索框模糊分页查询接口
+     */
+    @PostMapping("search/list")
+    public ResponseVO findSquareTaskOrProjectByName(@RequestBody SearchConditionVO searchConditionVO) {
+        return crowdTestSquareService.findSquareTaskOrProjectByName(searchConditionVO);
+    }
+
+    /**
+     * 根据测试类型筛选测试任务
+     *
+     * @return
+     */
+    @GetMapping("/task/{testTypeCode}")
+    public ResponseVO getAll(@PathVariable("testTypeCode") String testTypeCode) {
+        CrowdTestSquareIndexDTO crowdTestSquareIndexDTO = new CrowdTestSquareIndexDTO();
+        crowdTestSquareIndexDTO.setCrowdTestTaskVOS(crowdTaskService.findWaitingAcceptByNameLike(showTaskCount,"", testTypeCode));//众测任务
         return new ResponseVO(ServerCode.SUCCESS, crowdTestSquareIndexDTO);
     }
 
     /**
-     * 获取热门测试任务、热门测试项目
+     * 获取热门测试任务、热门测试项目卡片，按照接包人数、创建时间排序
      * @return
      */
     @GetMapping("/hotTaskAndProject")
     public ResponseVO getHotTaskAndProject() {
         CrowdTestSquareIndexDTO crowdTestSquareIndexDTO = new CrowdTestSquareIndexDTO();
-        crowdTestSquareIndexDTO.setHotCrowdTestProjectVOs(crowdProjectService.findHotProjectCardLimitCount(projectCount));//热门项目
-        crowdTestSquareIndexDTO.setHotCrowdTaskVOs(crowdTaskService.findMoreHotTasksList("", taskCount));//热门任务
+        crowdTestSquareIndexDTO.setHotCrowdTestProjectVOs(crowdProjectService.findHotProjectCardLimitCount(cardProjectCount));//热门项目
+        crowdTestSquareIndexDTO.setHotCrowdTaskVOs(crowdTaskService.findMoreHotTasksList("", cardTaskCount, ""));//热门任务
         return new ResponseVO(ServerCode.SUCCESS, crowdTestSquareIndexDTO);
     }
 
     /**
-     * 更多热门项目列表
+     * 更多热门项目列表，按照接包人数、状态、创建时间排序
      * @param searchConditionVO
      * @return
      */
-
     @PostMapping("/hotProject/list")
     public ResponseVO findMoreHotProjectLists(@RequestBody SearchConditionVO searchConditionVO) {
         Pageable pageable = this.getPageable(searchConditionVO);
@@ -89,40 +115,18 @@ public class CrowTestSquareController extends BaseSearchController {
     }
 
     /**
-     * 更多热门任务列表
+     * 更多热门任务列表，按照接包人数、状态、创建时间排序
      * @param searchConditionVO
      * @return
      */
-
     @PostMapping("/hotTasks/list")
     public ResponseVO findMoreHotTasksList(@RequestBody SearchConditionVO searchConditionVO) {
         Pageable pageable = this.getPageable(searchConditionVO);
-        List<CrowdTaskVO> crowdTestProjectVOList = crowdTaskService.findMoreHotTasksList(searchConditionVO.getKeyword(), 0);
+        List<CrowdTaskVO> crowdTestProjectVOList = crowdTaskService.findMoreHotTasksList(searchConditionVO.getKeyword(), 0, "");
         Page<CrowdTaskVO> taskVOPage = DataUtils.listToPage(crowdTestProjectVOList, pageable);
         return new ResponseVO(ServerCode.SUCCESS, taskVOPage);
     }
 
-    /**
-     * 根据测试类型筛选测试任务
-     *
-     * @return
-     */
-    @GetMapping("/task/{testTypeCode}")
-    public ResponseVO getAll(@PathVariable("testTypeCode") String testTypeCode) {
-        CrowdTestSquareIndexDTO crowdTestSquareIndexDTO = new CrowdTestSquareIndexDTO();
-        List<CrowdTaskVO> crowdTestTasks = crowdTaskService.findAllByTestTypeCode(testTypeCode);
-        crowdTestSquareIndexDTO.setCrowdTestTaskVOS(crowdTestTasks);//众测任务
-        return new ResponseVO(ServerCode.SUCCESS, crowdTestSquareIndexDTO);
-    }
-
-    /**
-     * 搜索框模糊分页查询接口
-     */
-    @PostMapping("search/list")
-    public ResponseVO findByNameLike(@RequestBody SearchConditionVO searchConditionVO) {
-        return crowdTestSquareService.findByNameLike(searchConditionVO);
-    }
-
     @Override
     public Page<?> search(String searchCondition) {
         return null;

site/src/main/java/com/mooctest/crowd/site/data/dto/MyCrowdDTO.java

@@ -24,6 +24,7 @@ public class MyCrowdDTO implements Serializable {
     private Long myProjectNoticeCount;
     private Long processProjectNoticeCount;
     private Long acceptableProjectNoticeCount;
+    private Long unfinishedTaskNoticeCount;
     private Long myProjectCount;
     private Long handlingProjectCount;
     private Long acceptableProjectCount;

site/src/main/java/com/mooctest/crowd/site/mediator/ViewMediator.java

@@ -102,7 +102,7 @@ public interface ViewMediator {
     //热门项目
     List<CrowdTestProjectVO> hotProjectCardLimitCount(int projectCount);
 
-    List<CrowdTaskVO> findIndexTaskLimitCount(int indexCount);
+    List<CrowdTaskVO> findIndexTaskLimitCount(int indexCount, String testTypeCode);
 
     List<CrowdTaskVO> crowdTaskVOSByTestTypeCode(String testTypeCode);
 

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

@@ -371,7 +371,7 @@ public class WebMediatorImpl implements ViewMediator {
         // 获取热门项目
         List<CrowdTestProjectVO> projectVOS = projectRepo.findHotProjectCardLimitCount(Integer.parseInt(indexProjectCount)).stream().map(CrowdTestProjectVO::new).collect(Collectors.toList());
         // 获取热门任务
-        List<CrowdTaskVO> taskVOS = crowdTaskService.findMoreHotTasksList("", Integer.parseInt(indexTaskCount));
+        List<CrowdTaskVO> taskVOS = crowdTaskService.findMoreHotTasksList("", Integer.parseInt(indexTaskCount), "");
         // 获取热门众测
         List<ApplicationTypeVO> applicationTypeRanks = getApplicationTypeRankVOS(pageable).stream().limit(Integer.parseInt(indexCrowdCount)).collect(Collectors.toList());
 
@@ -589,14 +589,18 @@ public class WebMediatorImpl implements ViewMediator {
                 allTaskOfAgency = taskToUserPOS.stream().map(taskToUserPO -> {
                             CrowdTestTaskPO crowdTestTaskPO = taskDao.findByCodeAndIsDeleted(taskToUserPO.getTaskCode(), DeletedStatus.isNotDeleted);
                             if (crowdTestTaskPO != null) {
+                                // 查找对应的项目
+                                String projectCode = crowdTestTaskPO.getCrowdTestProjectCode();
+                                CrowdTestProject project = projectRepo.getByProjectCodeJustInfo(projectCode);
                                 CrowdTestTask task = new CrowdTestTask();
                                 BeanUtils.copyProperties(crowdTestTaskPO, task);
                                 // 测试类型的转换
-                                task.setType(testMap.get(task.getType()));
+//                                task.setType(testMap.get(task.getType()));
                                 // 判断任务是否截止
                                 if (task.getDeadTime().getTime() <= System.currentTimeMillis() && task.getStatus() < CrowdTestTaskStatus.HAS_FINISHED) {
                                     task.setStatus(CrowdTestTaskStatus.HAS_TIME_OUT);
                                 }
+                                this.changeTypeByProjectAndTask(project, task, applicationMap, fieldMap, testMap);
                                 return task;
                             }
                             return null;
@@ -616,6 +620,7 @@ public class WebMediatorImpl implements ViewMediator {
         }
         myCrowdDTO.setFinishedTasks(finishedTasks);
         myCrowdDTO.setUnfinishedTasks(unfinishedTasks);
+        myCrowdDTO.setUnfinishedTaskNoticeCount((long) unfinishedTasks.size());
         myCrowdDTO.setFinishedTaskCount((long) (myCrowdDTO.getFinishedTasks() == null ? 0 : myCrowdDTO.getFinishedTasks().size()));
         myCrowdDTO.setUnfinishedTaskCount((long) (myCrowdDTO.getUnfinishedTasks() == null ? 0 : myCrowdDTO.getUnfinishedTasks().size()));
         return myCrowdDTO;
@@ -1216,9 +1221,10 @@ public class WebMediatorImpl implements ViewMediator {
      * 众测广场首页展示的6个众测任务
      * @return
      * @param indexCount
+     * @param testTypeCode
      */
     @Override
-    public List<CrowdTaskVO> findIndexTaskLimitCount(int indexCount){
+    public List<CrowdTaskVO> findIndexTaskLimitCount(int indexCount, String testTypeCode){
         List<CrowdTaskVO> resultList = new ArrayList<>();
         Map<String, String> testMap = commonRepo.getTypeCodeNameMap();
 

site/src/main/java/com/mooctest/crowd/site/service/CrowdTaskService.java

@@ -19,9 +19,11 @@ public interface CrowdTaskService {
 
     List<CrowdTaskVO> findMoreHotTasks();
 
-    List<CrowdTaskVO> findIndexTaskLimitCount(int indexCount);
+    List<CrowdTaskVO> findMoreHotTasksList(String keyword, int taskCount, String testTypeCode);
 
-    List<CrowdTaskVO> findAllByTestTypeCode(String testTypeCode);
+    List<CrowdTaskVO> findIndexTaskLimitCount(int indexCount, String testTypeCode);
+
+    List<CrowdTaskVO> findHotTestByTestTypeCode(String testTypeCode);
 
     List<CrowdTaskVO> findSquareTaskByNameLike(String name);
 
@@ -43,8 +45,6 @@ public interface CrowdTaskService {
 
     TaskDetailsDTO confirmFinish(String projectCode, String taskCode, Long userId);
 
-    List<CrowdTaskVO> findMoreHotTasksList(String keyword, int taskCount);
-
     void  jumpPublicTesting(String projectCode, String taskCode, Long userId);
 
     TaskDetailsDTO addToken(String projectCode, String taskCode, Long userId, String token);
@@ -54,4 +54,6 @@ public interface CrowdTaskService {
     String exportTask(String projectCode, String taskCode, Long userId);
 
     ProjectDetailsDTO importTask(MultipartFile file, Long userId, int uploadType);
+
+    List<CrowdTaskVO> findWaitingAcceptByNameLike(int showTaskCount, String keyword, String testTypeCode);
 }

site/src/main/java/com/mooctest/crowd/site/service/CrowdTestSquareService.java

@@ -5,7 +5,7 @@ import com.mooctest.crowd.site.data.vo.SearchConditionVO;
 
 public interface CrowdTestSquareService {
 
-    ResponseVO findByNameLike(SearchConditionVO searchConditionVO);
+    ResponseVO findSquareTaskOrProjectByName(SearchConditionVO searchConditionVO);
 
     ResponseVO findAllByNameLike(SearchConditionVO searchConditionVO);
 }

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

@@ -2,6 +2,7 @@ package com.mooctest.crowd.site.service.impl;
 
 import com.alibaba.fastjson.JSON;
 import com.google.gson.Gson;
+import com.google.gson.GsonBuilder;
 import com.mooctest.crowd.domain.dao.*;
 import com.mooctest.crowd.domain.domainobject.*;
 import com.mooctest.crowd.domain.exception.*;
@@ -37,6 +38,7 @@ import org.springframework.stereotype.Service;
 import org.springframework.web.multipart.MultipartFile;
 
 import java.io.*;
+import java.sql.Timestamp;
 import java.util.*;
 import java.util.stream.Collectors;
 
@@ -103,7 +105,7 @@ public class CrowdTaskServiceImpl implements CrowdTaskService {
     }
 
     @Override
-    public List<CrowdTaskVO> findMoreHotTasksList(String keyword, int taskCount) {
+    public List<CrowdTaskVO> findMoreHotTasksList(String keyword, int taskCount, String testTypeCode) {
         // 获取领域、应用、测试类型code 和 name 的map
         Map<String, String> fieldMap = commonRepo.getFieldCodeNameMap();
         Map<String, String> applicationMap = commonRepo.getApplicationCodeNameMap();
@@ -135,6 +137,10 @@ public class CrowdTaskServiceImpl implements CrowdTaskService {
         if (keyword != null && keyword != "") {
             crowdTaskVOS = crowdTaskVOS.stream().filter(crowdTaskVO -> crowdTaskVO.getTitle().contains(keyword)).collect(Collectors.toList());
         }
+
+        if (!testTypeCode.equals("")){
+            crowdTaskVOS = crowdTaskVOS.stream().filter(crowdTaskVO -> crowdTaskVO.getServiceType().equals(testTypeCode)).collect(Collectors.toList());
+        }
         // 对结果进行排序 接收任务、任务状态、任务创建时间
         List<CrowdTaskVO> taskVOS;
         taskVOS = crowdTaskVOS.stream().filter(crowdTaskVO -> crowdTaskVO.getStatus() != CrowdTestTaskStatus.HAS_TIME_OUT)
@@ -148,17 +154,22 @@ public class CrowdTaskServiceImpl implements CrowdTaskService {
     }
 
     @Override
+    public List<CrowdTaskVO> findWaitingAcceptByNameLike(int showTaskCount, String keyword, String testTypeCode) {
+        return this.findMoreHotTasksList(keyword, showTaskCount, testTypeCode);
+    }
+
+    @Override
     public void jumpPublicTesting(String projectCode, String taskCode, Long userId) {
         viewMediator.jumpPublicTesting(projectCode,taskCode,userId);
     }
 
     @Override
-    public List<CrowdTaskVO> findIndexTaskLimitCount(int indexCount) {
-        return viewMediator.findIndexTaskLimitCount(indexCount);
+    public List<CrowdTaskVO> findIndexTaskLimitCount(int indexCount, String testTypeCode) {
+        return viewMediator.findIndexTaskLimitCount(indexCount, testTypeCode);
     }
 
     @Override
-    public List<CrowdTaskVO> findAllByTestTypeCode(String testTypeCode) {
+    public List<CrowdTaskVO> findHotTestByTestTypeCode(String testTypeCode) {
         return viewMediator.crowdTaskVOSByTestTypeCode(testTypeCode);
     }
 
@@ -410,7 +421,7 @@ public class CrowdTaskServiceImpl implements CrowdTaskService {
         log.info("导入的文件为：" + file.getOriginalFilename());
         // 将文件内容读出变成字符串
         String fileString = fileToString(file);
-        Gson gson = new Gson();
+        Gson gson = new GsonBuilder().setDateFormat("yyyy-MM-dd HH:mm:ss").create();
         // 将字符串序列化成对象
         ProjectDetailsDTO projectDetailsDTO = gson.fromJson(fileString, ProjectDetailsDTO.class);
 
@@ -462,6 +473,7 @@ public class CrowdTaskServiceImpl implements CrowdTaskService {
         crowdTestProject.setLinkManMobile(user.getMobile());
         crowdTestProject.setLinkMan(user.getName());
         crowdTestProject.setProjectDistributionTypeId(DistributeType.SQUARE.getId());
+        crowdTestProject.setCreateTime(new Timestamp(System.currentTimeMillis()));
         // 判断领域类型是否存在
         Optional<FieldPO> fieldPO = fieldDao.findByName(crowdTestProject.getFieldType());
         if(fieldPO.isPresent()){
@@ -493,6 +505,7 @@ public class CrowdTaskServiceImpl implements CrowdTaskService {
         crowdTestTask.setAcceptedCount(0);
         crowdTestTask.setParticipantHasCommittedCount(0);
         crowdTestTask.setFullStatus(0);
+        crowdTestTask.setCreateTime(new Timestamp(System.currentTimeMillis()));
         crowdTestTask.setStatus(CrowdTestTaskStatus.HAS_RELEASED);
         // 判断默认的测试类型MCZC是否存在
         if(testTypeDao.findByCode(taskTypeCode).isPresent()){

site/src/main/java/com/mooctest/crowd/site/service/impl/CrowdTestSquareServiceImpl.java

@@ -1,5 +1,7 @@
 package com.mooctest.crowd.site.service.impl;
 
+import com.mooctest.crowd.domain.repository.CommonRepo;
+import com.mooctest.crowd.domain.repository.CrowdTestProjectRepo;
 import com.mooctest.crowd.site.constants.CommonConstant;
 import com.mooctest.crowd.site.data.ColumnFilter;
 import com.mooctest.crowd.site.data.enums.ColumnFilterType;
@@ -8,6 +10,7 @@ import com.mooctest.crowd.site.data.response.ServerCode;
 import com.mooctest.crowd.site.data.vo.CrowdTaskVO;
 import com.mooctest.crowd.site.data.vo.CrowdTestProjectVO;
 import com.mooctest.crowd.site.data.vo.SearchConditionVO;
+import com.mooctest.crowd.site.mediator.ViewMediator;
 import com.mooctest.crowd.site.service.CrowdProjectService;
 import com.mooctest.crowd.site.service.CrowdTaskService;
 import com.mooctest.crowd.site.service.CrowdTestSquareService;
@@ -22,6 +25,7 @@ import org.springframework.stereotype.Service;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.stream.Collectors;
 
 /**
  * @author:xx
@@ -35,6 +39,12 @@ public class CrowdTestSquareServiceImpl implements CrowdTestSquareService {
     private CrowdProjectService crowdProjectService;
     @Autowired
     private CrowdTaskService crowdTaskService;
+    @Autowired
+    private CrowdTestProjectRepo projectRepo;
+    @Autowired
+    private CommonRepo commonRepo;
+    @Autowired
+    private ViewMediator viewMediator;
 
 
     /**
@@ -43,15 +53,23 @@ public class CrowdTestSquareServiceImpl implements CrowdTestSquareService {
      * @return
      */
     @Override
-    public ResponseVO findByNameLike(SearchConditionVO searchConditionVO) {
+    public ResponseVO findSquareTaskOrProjectByName(SearchConditionVO searchConditionVO) {
         Pageable pageable = this.getPageable(searchConditionVO);
         String keyword = searchConditionVO.getKeyword();
+        // 获取领域、应用、测试类型code 和 name 的map
+        Map<String, String> fieldMap = commonRepo.getFieldCodeNameMap();
+        Map<String, String> applicationMap = commonRepo.getApplicationCodeNameMap();
+        Map<String, String> testMap = commonRepo.getTypeCodeNameMap();
+
         if (searchConditionVO.getColumnFilters().get(0).getType().equals("project")) {
-            List<CrowdTestProjectVO> list = crowdProjectService.findSquareProjectByNameLike(keyword);
-            Page<CrowdTestProjectVO> projectVOPage = DataUtils.listToPage(list, pageable);
+            List<CrowdTestProjectVO> projectVOS = projectRepo.findWaitingAcceptByNameLike("%"+keyword+"%").stream().map(crowdTestProject -> {
+                viewMediator.changeFieldAndApplicationAndTestType(crowdTestProject, applicationMap, fieldMap, testMap);
+                return new CrowdTestProjectVO(crowdTestProject);
+            }).collect(Collectors.toList());
+            Page<CrowdTestProjectVO> projectVOPage = DataUtils.listToPage(projectVOS, pageable);
             return new ResponseVO<>(ServerCode.SUCCESS, projectVOPage);
         } else if (searchConditionVO.getColumnFilters().get(0).getType().equals("task")) {
-            List<CrowdTaskVO> taskVOList = crowdTaskService.findByNameLike(keyword);
+            List<CrowdTaskVO> taskVOList = crowdTaskService.findWaitingAcceptByNameLike(0, keyword, "");
             Page<CrowdTaskVO> crowdTaskVOPage = DataUtils.listToPage(taskVOList, pageable);
             return new ResponseVO(ServerCode.SUCCESS, crowdTaskVOPage);
         }

site/src/main/resources/application.yml

@@ -55,12 +55,16 @@ index:
     residentAgency: 12
 
 square:
-  index:
-    count: 6
-  task:
-    count: 6
-  project:
-    count: 6
+  count:
+    index:
+      task: 6
+      project: 6
+    card:
+      task: 6
+      project: 6
+    show:
+      task: 12
+      project: 12
 
 private:
   cloud: