Explorar el Código

修复任务结束后的视图控制

guo00guo hace 5 años
padre
commit
18f23d444a

+ 9 - 2
site/src/main/java/com/mooctest/crowd/site/data/TaskOperationControl.java

@@ -18,7 +18,6 @@ public class TaskOperationControl {
     private boolean update = false;
     private boolean uploadReport = false;
     private boolean finish = false;
-    private boolean finishByManager = false;
     private boolean confirmFinish = false;
 
     public void hasAll(){
@@ -27,7 +26,15 @@ public class TaskOperationControl {
         this.confirmFinish = true;
         this.update = true;
         this.finish = true;
-        this.finishByManager = true;
         this.uploadReport = true;
     }
+
+    public void noAll(){
+        this.receive = false;
+        this.reject = false;
+        this.confirmFinish = false;
+        this.update = false;
+        this.finish = false;
+        this.uploadReport = false;
+    }
 }

+ 4 - 1
site/src/main/java/com/mooctest/crowd/site/mediator/impl/WebMediatorImpl.java

@@ -521,7 +521,7 @@ public class WebMediatorImpl implements ViewMediator {
                         operationControl.setFinish(true);
                     }
                 } else if (project.getStatus() == CrowdTestProjectStatus.HAS_COMMITED){
-                    operationControl.setCreateTask(true);
+                    operationControl.setCreateTask(false);
                 }
             } //下面两种情况为非定向未被接收
             else if (project.getProjectDistributionTypeId()==1){
@@ -600,6 +600,9 @@ public class WebMediatorImpl implements ViewMediator {
                 }
             }
         }
+        if(task.getStatus() == CrowdTestTaskStatus.HAS_FINISHED){
+            taskOperationControl.noAll();
+        }
         System.out.println(taskOperationControl);
         return taskOperationControl;
     }