已完成项目分开

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

@@ -5,6 +5,7 @@ import com.alibaba.fastjson.JSONArray;
 import com.google.common.collect.Lists;
 import com.mooctest.crowd.domain.domainobject.CrowdTestProject;
 import com.mooctest.crowd.domain.domainobject.CrowdTestProjectStatus;
+import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
@@ -20,6 +21,7 @@ import java.util.Map;
  */
 @Data
 @NoArgsConstructor
+@AllArgsConstructor
 public class CrowdProjectVO implements Serializable {
 
     private String id;

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

@@ -530,7 +530,18 @@ public class WebMediatorImpl implements ViewMediator {
                     projectVO = changeApplicationType(projectVO);
                     return projectVO;
                 }).collect(Collectors.toList());
-        //对于区域管理员
+        List<CrowdProjectVO> myProject=new ArrayList<>();
+        List<CrowdProjectVO> finishedProjects=new ArrayList<>();
+        for(int i=0;i<myProejcts.size();i++){
+            if(myProejcts.get(i).getStatus()<CrowdTestProjectStatus.HAS_FINISHED){
+                myProject.add(myProejcts.get(i));
+                myCrowdDTO.setMyProjects(myProject);
+            }else if(myProejcts.get(i).getStatus()>=CrowdTestProjectStatus.HAS_FINISHED){
+                finishedProjects.add(myProejcts.get(i));
+                myCrowdDTO.setFinishedProjects(finishedProjects);
+            }
+        }
+        //对于区域管理员crowdTestProjectPO -> crowdTestProjectPO.getStatus() > CrowdTestProjectStatus.HAS_RELEASED
         if (user.getRoleList().stream().anyMatch(role -> role.getName().equals("RegionalManager"))) {
             List<CrowdTestProjectPO> crowdTestProjectPOList = projectDao.findByRegionalManagerIdAndIsDeleted(userId, DeletedStatus.isNotDeleted)
                     .stream().sorted(Comparator.comparing(CrowdTestProjectPO::getCreateTime).thenComparing(CrowdTestProjectPO::getStatus).reversed()).collect(Collectors.toList());
@@ -567,7 +578,6 @@ public class WebMediatorImpl implements ViewMediator {
             myCrowdDTO.setAcceptableProjectNoticeCount(Long.parseLong("" + acceptableProject.size()));
         }
         UserVO userVO = new UserVO(user);
-        myCrowdDTO.setMyProjects(myProejcts);
         myCrowdDTO.setUserVO(userVO);
         myCrowdDTO.setMyProjectNoticeCount(myProejcts.stream().filter(CrowdProjectVO::getNeedHandle).count());
         myCrowdDTO.setProcessProjectNoticeCount(myCrowdDTO.getHandlingProjects() == null ? 0 : myCrowdDTO