Ver Fonte

项目创建初始化状态

xuexiaobo há 6 anos atrás
pai
commit
822ca9a97c

+ 3 - 2
site/src/main/java/com/mooctest/crowd/site/controller/CrowdProjectController.java

@@ -121,8 +121,9 @@ public class CrowdProjectController {
         return projectService.importMultiProjectsByExcel(projects);
     }
 
-    @RequestMapping(value = "/api/project/{projectCode}/status/accept")
-    public void acceptProject(@PathVariable("projectCode") String projectCode, HttpServletRequest request){
+    @RequestMapping(value = "/api/project/{projectCode}/regionManager/{userId}")
+    public void acceptProject(@PathVariable("projectCode") String projectCode, @PathVariable("userId") Long userId){
+        projectService.receiveProject(projectCode, userId);
     }
 
     @RequestMapping(value = "/api/regionalManager", method = RequestMethod.GET)

+ 1 - 0
site/src/main/java/com/mooctest/crowd/site/mediator/impl/OperationMediatorImpl.java

@@ -34,6 +34,7 @@ public class OperationMediatorImpl implements OperationMediator {
         CrowdTestProject updateProject = crowdTestProjectCommand.toCrowdProject();
         updateProject.setId(project.getId());
         updateProject.setCode(project.getCode());
+        updateProject.setStatus(project.getStatus());
         return updateProject;
     }
 }

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

@@ -182,9 +182,7 @@ public class WebMediatorImpl implements ViewMediator {
     @Override
     public ProjectDetailsDTO renderProjectDetails(CrowdTestProject project) {
         ProjectDetailsDTO projectDetailsDTO = new ProjectDetailsDTO();
-        List<CrowdTaskVO> taskVOList = project.getCrowdTestTaskList().stream().map(crowdTestTask -> {
-            return new CrowdTaskVO(crowdTestTask);
-        }).collect(Collectors.toList());
+        List<CrowdTaskVO> taskVOList = project.getCrowdTestTaskList().stream().map(CrowdTaskVO::new).collect(Collectors.toList());
         List<CrowdReportVO> reportVOList = null;
         if (project.getCrowdTestReportForProject() != null) {
             reportVOList = new ArrayList<>();

+ 2 - 0
site/src/main/java/com/mooctest/crowd/site/service/CrowdProjectService.java

@@ -30,4 +30,6 @@ public interface CrowdProjectService {
     List<CrowdTestProject> generateProjectByExcel(Long userId, MultipartFile file);
 
     List<RegionalManagerVO> getRegionalManagerList();
+
+    void receiveProject(String projectCode, Long userId);
 }

+ 9 - 1
site/src/main/java/com/mooctest/crowd/site/service/impl/CrowdProjectServiceImpl.java

@@ -64,7 +64,7 @@ public class CrowdProjectServiceImpl implements CrowdProjectService {
     @Override
     public ProjectDetailsDTO createCrowdProject(CrowdTestProjectCommand command) {
         CrowdTestProject project = command.toCrowdProject();
-        project.setStatus(CrowdTestProjectStatus.HAS_CREATED);
+        project.setStatus(CrowdTestProjectStatus.HAS_RELEASED);
         log.info("\n"+project.toString()+"\n");
         String projectCode = GenerateFlowCodeUtil.generateFlowCode("PROJ");
         project.setCode(projectCode);
@@ -173,6 +173,14 @@ public class CrowdProjectServiceImpl implements CrowdProjectService {
         return viewMediator.renderRegionManagerList();
     }
 
+    @Override
+    public void receiveProject(String projectCode, Long userId) {
+        CrowdTestProject project = projectRepo.getByProjectCode(projectCode);
+//        if (project.getProjectDistributionTypeId())
+        project.receiveProject();
+        projectRepo.saveCrowdTestProject(project);
+    }
+
     private List<CrowdTestProject> transferExcel2Projects(MultipartFile file){
         List<String> logList = new ArrayList<>();
         List<CrowdTestProject> projects = new ArrayList<>();