Browse Source

如果定向任务被拒绝其他机构也是可以接受任务。

xuxuan 5 years ago
parent
commit
90cbd928ce

+ 4 - 3
core/src/main/java/com/mooctest/crowd/domain/domainobject/CrowdTestTask.java

@@ -15,7 +15,7 @@ import java.util.stream.Collectors;
  * @date 2019/7/11 14:14
  */
 @Data
-public class CrowdTestTask {
+public class CrowdTestTask{
     private Long id;
     private String name;
     private String code;
@@ -82,7 +82,7 @@ public class CrowdTestTask {
      * 接收任务(测评机构)
      * @return
      */
-    public void receive(User user) {
+    public void receive(User user){
         //判断是否为测评机构
         EvaluationAgency evaluationAgency = user.getEvaluationAgency();
         if(evaluationAgency == null){
@@ -92,7 +92,7 @@ public class CrowdTestTask {
         if(this.getStatus() == CrowdTestTaskStatus.HAS_RECEIVED){
             if(this.getFullStatus() == CrowdTestTaskAcceptStatus.HAS_FULL)
                 throw new CrowdTestTaskException("当前任务满员!:");
-        }else if (this.getStatus()!=CrowdTestTaskStatus.HAS_RELEASED)
+        }else if(this.getStatus()!=CrowdTestTaskStatus.HAS_RELEASED&&this.getStatus()!=CrowdTestTaskStatus.HAS_REJECTED)
             throw new CrowdTestTaskException("任务当前状态不能被接收,当前状态为:"+this.getStatus());
         //定向发布类型
 //        if (this.getDistributionType() == 0) {
@@ -143,6 +143,7 @@ public class CrowdTestTask {
         this.setStatus(CrowdTestTaskStatus.HAS_REJECTED);
     }
 
+
     public void removeCrowdTestTask() {
         this.isDeleted = DeletedStatus.isDeleted;
     }