Merge branch 'feature-V2.0' of ssh://git.mooctest.com:1022/crowd-2019/crowd-test-service-backend into feature-V2.0

core/src/main/java/com/mooctest/crowd/domain/domainobject/CrowdTestProject.java

@@ -15,7 +15,6 @@ import java.util.Optional;
  */
 @Data
 public class CrowdTestProject {
-
     private Long id;
     private String name;
     private String code;

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

@@ -56,29 +56,9 @@ public class CrowTestSquareController extends BaseSearchController {
         return new ResponseVO(ServerCode.SUCCESS, crowdTestSquareIndexDTO);
     }
 
-    /**
-     * 众测项目分页查询接口
-     */
-    @PostMapping("/project/list")
-    public ResponseVO findAllprojectByPage(@RequestBody SearchConditionVO searchConditionVO) {
-        Pageable pageable = this.getPageable(searchConditionVO);
-        List<CrowdTestProjectVO> list = crowdProjectService.findAll(pageable);
-        Page<CrowdTestProjectVO> page = DataUtils.listToPage(list, pageable);
-        return new ResponseVO<>(ServerCode.SUCCESS, page);
-    }
-
-    /**
-     * 众测任务分页查询接口
-     */
-    @PostMapping("/task/list")
-    public ResponseVO<Page<CrowdTaskVO>> getAllTaskByPage(@RequestBody SearchConditionVO searchConditionVO) {
-        Pageable pageable = this.getPageable(searchConditionVO);
-        Page<CrowdTaskVO> page = commonService.getTaskinfo(pageable, null, 0);
-        return new ResponseVO<>(ServerCode.SUCCESS, page);
-    }
 
     /**
-     * 搜索框模糊查询接口
+     * 搜索框模糊分页查询接口
      */
     @PostMapping("search/list")
     public ResponseVO findByNameLike(@RequestBody SearchConditionVO searchConditionVO) {
@@ -89,7 +69,6 @@ public class CrowTestSquareController extends BaseSearchController {
         ProjectAndTaskDTO projectAndTaskDTO = new ProjectAndTaskDTO();
         List<CrowdTestProjectVO> list = crowdProjectService.findByNameLike(keyword);
         List<CrowdTaskVO> taskVOList = crowdTaskService.findByNameLike(keyword);
-
         projectAndTaskDTO.setCrowdTaskVOList(taskVOList);
         projectAndTaskDTO.setProjectVOList(list);
         List projectAndTaskDTOList = new ArrayList<>();

site/src/main/java/com/mooctest/crowd/site/data/vo/CrowdTaskVO.java

@@ -3,15 +3,15 @@ package com.mooctest.crowd.site.data.vo;
 import com.mooctest.crowd.domain.domainobject.CrowdTestTask;
 import com.mooctest.crowd.domain.domainobject.CrowdTestTaskAcceptStatus;
 import com.mooctest.crowd.domain.domainobject.CrowdTestTaskStatus;
+import lombok.AllArgsConstructor;
 import lombok.Data;
-
+import lombok.NoArgsConstructor;
 import java.io.Serializable;
 import java.sql.Timestamp;
 import java.text.DateFormat;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
 import java.util.*;
-
 import static com.mooctest.crowd.site.data.vo.CrowdTestProjectVO.getDistanceTimes;
 
 /**
@@ -19,8 +19,9 @@ import static com.mooctest.crowd.site.data.vo.CrowdTestProjectVO.getDistanceTime
  * @Date: 2019.7.15 20:36
  */
 @Data
-public class CrowdTaskVO implements Serializable {
-
+@NoArgsConstructor
+@AllArgsConstructor
+public class CrowdTaskVO implements Serializable{
     private long id;
     private String projectId;
     private String title;

site/src/main/java/com/mooctest/crowd/site/data/vo/CrowdTestProjectVO.java

@@ -1,19 +1,14 @@
 package com.mooctest.crowd.site.data.vo;
 
 import com.mooctest.crowd.domain.domainobject.CrowdTestProject;
-import com.mooctest.crowd.domain.domainobject.CrowdTestReport;
-import com.mooctest.crowd.domain.domainobject.CrowdTestTask;
-import com.mooctest.crowd.domain.model.CrowdTestProjectPO;
-import com.mooctest.crowd.domain.model.TechnicalArticlesPO;
+import lombok.AllArgsConstructor;
 import lombok.Data;
+import lombok.NoArgsConstructor;
 
-import javax.persistence.Column;
 import java.sql.Timestamp;
 import java.text.DateFormat;
-import java.text.ParseException;
 import java.text.SimpleDateFormat;
 import java.util.Date;
-import java.util.List;
 
 /**
  * @author:xx
@@ -22,7 +17,9 @@ import java.util.List;
  */
 
 @Data
-public class CrowdTestProjectVO {
+@NoArgsConstructor
+@AllArgsConstructor
+public class CrowdTestProjectVO   {
     private Long id;
     private String code;
     private String name;
@@ -50,6 +47,9 @@ public class CrowdTestProjectVO {
     private Timestamp createTime;
     private String time_interval;
 
+
+
+
     public CrowdTestProjectVO(CrowdTestProject crowdTestProject) {
         id = crowdTestProject.getId();
         code = crowdTestProject.getCode();