添加拒绝按钮的控制

core/src/main/java/com/mooctest/crowd/domain/factory/CrowdTestProjectFactory.java

@@ -24,7 +24,7 @@ public class CrowdTestProjectFactory {
         project.setProjectDistributionTypeId(1L);
         project.setDistributionProvince("江苏");
         project.setDistributionCity("南京");
-        project.setRegionalManagerId(1L);
+        project.setRegionalManagerId(99222L);
         project.setUserId(1L);
         project.setProjectFile("");
         project.setRequirementFile("");
@@ -40,8 +40,6 @@ public class CrowdTestProjectFactory {
         task.setStatus(CrowdTestTaskStatus.HAS_FINISHED);
         task.setEvaluationAgencyId(1l);
         task.setDistributionType(0l);
-        task.setDistributionProvince("江苏");
-        task.setDistributionCity("南京");
         return task;
     }
 

site/src/main/java/com/mooctest/crowd/site/data/ProjectOperationControl.java

@@ -0,0 +1,9 @@
+package com.mooctest.crowd.site.data;
+
+/**
+ * @author: Diors.Po
+ * @Email: 171256175@qq.com
+ * @date 2019-08-23 16:04
+ */
+public class ProjectOperationControl {
+}

site/src/main/java/com/mooctest/crowd/site/data/TaskOperationControl.java

@@ -14,6 +14,7 @@ import lombok.NoArgsConstructor;
 @AllArgsConstructor
 public class TaskOperationControl {
     private boolean receive = false;
+    private boolean reject = false;
     private boolean update = false;
     private boolean uploadReport = false;
     private boolean finish = false;
@@ -21,6 +22,7 @@ public class TaskOperationControl {
 
     public void hasAll(){
         this.receive = true;
+        this.reject = true;
         this.confirmFinish = true;
         this.update = true;
         this.finish = true;

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

@@ -131,13 +131,13 @@ public class WebMediatorImpl implements ViewMediator {
         if (user.getRegionalManager() != null){
             List<CrowdTestProjectPO> crowdTestProjectPOList = projectDao.findByRegionalManagerIdAndIsDeleted(userId, DeletedStatus.isNotDeleted);
             //获取区域管理员正在处理中的项目列表
-            myCrowdDTO.setHandlingProjects(crowdTestProjectPOList.stream().filter(crowdTestProjectPO -> crowdTestProjectPO.getStatus()==2).map(crowdTestProjectPO -> {
+            myCrowdDTO.setHandlingProjects(crowdTestProjectPOList.stream().filter(crowdTestProjectPO -> crowdTestProjectPO.getStatus()>CrowdTestProjectStatus.HAS_RECEIVED).map(crowdTestProjectPO -> {
                 CrowdTestProject project = new CrowdTestProject();
                 BeanUtils.copyProperties(crowdTestProjectPO, project);
                 return new CrowdProjectVO(project); }).collect(Collectors.toList()));
             //获取区域管理员可以接收领取的项目列表
             //定向
-            List<CrowdTestProjectPO> acceptableProject = crowdTestProjectPOList.stream().filter(crowdTestProjectPO -> crowdTestProjectPO.getStatus()<2).collect(Collectors.toList());
+            List<CrowdTestProjectPO> acceptableProject = crowdTestProjectPOList.stream().filter(crowdTestProjectPO -> crowdTestProjectPO.getStatus()<CrowdTestProjectStatus.HAS_RECEIVED).collect(Collectors.toList());
             //广场的
             acceptableProject.addAll(projectDao.findAllByStatusLessThanAndProjectDistributionTypeId(CrowdTestProjectStatus.HAS_RECEIVED, 2L));
             //区域的

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

@@ -144,6 +144,8 @@ public class CrowdTaskServiceImpl implements CrowdTaskService {
                     ||(task.getDistributionType()==2 && task.getStatus()>CrowdTestTaskStatus.HAS_RELEASED && task.getEvaluationAgencyId().equals(user.getId()))){
                 if (task.getStatus()<CrowdTestTaskStatus.HAS_RECEIVED){
                     taskOperationControl.setReceive(true);
+                    if (task.getDistributionType()==0)
+                        taskOperationControl.setReject(true);
                 } else if (task.getStatus() == CrowdTestTaskStatus.HAS_RECEIVED){
                     taskOperationControl.setUploadReport(true);
                 }