瀏覽代碼

Merge branch 'Dev' into 'Test'

Dev

See merge request crowd-2019/crowd-test-service-backend!134
郭超 5 年之前
父節點
當前提交
17d5d020ec
共有 1 個文件被更改,包括 7 次插入1 次删除
  1. 7 1
      site/src/main/java/com/mooctest/crowd/site/service/impl/CrowdTaskServiceImpl.java

+ 7 - 1
site/src/main/java/com/mooctest/crowd/site/service/impl/CrowdTaskServiceImpl.java

@@ -160,12 +160,18 @@ public class CrowdTaskServiceImpl implements CrowdTaskService {
             throw new BaseException("您是项目发起者,不可接收自己项目下的测试任务!");
         }
         CrowdTestTask task = project.getTask(taskCode);
+        // 是否为第一个接包的人标识
+        boolean isFirstAcceptPeople = false;
+        if(task.getStatus() == CrowdTestTaskStatus.HAS_RELEASED){
+            isFirstAcceptPeople = true;
+        }
+
         task.receive(userRepo.getByID(userId));
         project.setJoinCount(project.getJoinCount() + 1);
 
         // 判断是否为第三方任务,如果是则管理员自身也是一个参与者
         Optional<EndPointPO> endPointPOOptional = endPointDao.findByTaskCode(task.getCode());
-        if(endPointPOOptional.isPresent()){
+        if(endPointPOOptional.isPresent() && isFirstAcceptPeople){
             task.receive(userRepo.getByID(project.getRegionalManagerId()));
             project.setJoinCount(project.getJoinCount() + 1);
         }