"修改个人认证和企业认证字段"

core/src/main/java/com/mooctest/crowd/domain/dao/CrowdTestTaskDao.java

@@ -30,7 +30,7 @@ public interface CrowdTestTaskDao extends CrudRepository<CrowdTestTaskPO, Long>
     @Query(value = "SELECT new com.mooctest.crowd.domain.model.RankInfo(SUM(p.quotedPrice), p.evaluationAgencyId) FROM CrowdTestTaskPO p where p.evaluationAgencyId is not null and p.status>1 GROUP BY p.evaluationAgencyId ORDER BY SUM(p.quotedPrice) DESC")
     List<RankInfo> findTotalPriceOfAgency(Pageable pageable);
 
-    @Query(nativeQuery = true, value = "select * from crowd_test_task where CTT_STATUS = 1 order by CTT_QUOTED_PRICE DESC LIMIT 4")
+    @Query(nativeQuery = true, value = "select * from crowd_test_task where CTT_STATUS=1 and CTT_DISTRIBUTION_TYPE=2 order by CTT_QUOTED_PRICE DESC LIMIT 4")
     List<CrowdTestTaskPO> findHotTask();
 
     @Override

core/src/main/java/com/mooctest/crowd/domain/domainobject/CrowdTestProject.java

@@ -432,7 +432,6 @@ public class CrowdTestProject {
         }
     }
 
-
     /**
      * 接收任务（测评机构）
      * @return

site/src/main/java/com/mooctest/crowd/site/controller/CrowdTaskController.java

@@ -14,7 +14,6 @@ import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
 import javax.servlet.http.HttpSession;
-import java.util.List;
 
 /**
  * @author: Diors.Po
@@ -72,4 +71,16 @@ public class CrowdTaskController {
             throw new BaseException("信息不合法，项目可见性选择存在问题");
         return taskService.updateTask(projectCode, taskCode, command, Long.parseLong((String)session.getAttribute("userId")));
     }
+
+    @LoginRequired
+    @RequestMapping(value = "/project/{projectCode}/task/{taskCode}/agency/{userId}", method = RequestMethod.PUT)
+    public TaskDetailsDTO acceptTask(@PathVariable("projectCode") String projectCode, @PathVariable("taskCode") String taskCode,
+                                     @PathVariable("userId") Long userId, HttpSession session){
+        Long loginUserId = Long.parseLong((String)session.getAttribute("userId"));
+        log.info("userId in Url: " + userId + ", userId in session: " + loginUserId);
+        if(!loginUserId.equals(userId)) {
+            throw new UnauthorizedException("非法操作，操作用户不一致");
+        }
+        return taskService.acceptTask(projectCode, taskCode, userId);
+    }
 }

site/src/main/java/com/mooctest/crowd/site/service/CrowdTaskService.java

@@ -1,10 +1,12 @@
 package com.mooctest.crowd.site.service;
 
 import com.mooctest.crowd.site.command.CrowdTestTaskCommand;
+import com.mooctest.crowd.site.data.TaskOperationControl;
 import com.mooctest.crowd.site.data.dto.TaskDetailsDTO;
 import com.mooctest.crowd.site.data.dto.TaskSquareDTO;
 import com.mooctest.crowd.site.data.vo.EvolutionAgencyVO;
 
+import java.util.ArrayList;
 import java.util.List;
 
 /**
@@ -20,4 +22,6 @@ public interface CrowdTaskService {
     TaskDetailsDTO updateTask(String projectCode, String taskCode, CrowdTestTaskCommand command, Long userId);
 
     TaskSquareDTO getAllTasks();
+
+    TaskDetailsDTO acceptTask(String projectCode, String taskCode, Long userId);
 }

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

@@ -127,8 +127,17 @@ public class CrowdTaskServiceImpl implements CrowdTaskService {
         return taskSquareDTO;
     }
 
+    @Override
+    public TaskDetailsDTO acceptTask(String projectCode, String taskCode, Long userId) {
+        CrowdTestProject project = projectRepo.getByProjectCode(projectCode);
+        project.receiveTask(taskCode, userRepo.getByID(userId));
+        projectRepo.saveCrowdTestProject(project);
+        return getTaskDetails(projectCode, taskCode, userId);
+    }
+
     private TaskOperationControl initPermission(CrowdTestProject project,CrowdTestTask task, User user){
         TaskOperationControl taskOperationControl = new TaskOperationControl();
+        log.info("userInfo"+user.toString());
         if (user==null)
             return taskOperationControl;
         if (user.getRoleList().stream().anyMatch(role -> role.getName().equals("SystemAdministrator"))
@@ -162,6 +171,7 @@ public class CrowdTaskServiceImpl implements CrowdTaskService {
                 }
             }
         }
+        System.out.println(taskOperationControl);
         return taskOperationControl;
     }
 }