修复类型转换

core/src/main/java/com/mooctest/crowd/domain/factory/CrowdTestProjectFactory.java

@@ -1,7 +1,6 @@
 package com.mooctest.crowd.domain.factory;
 
 import com.mooctest.crowd.domain.domainobject.*;
-import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Component;
 
 import java.sql.Date;
@@ -14,11 +13,11 @@ import java.sql.Timestamp;
 @Component
 public class CrowdTestProjectFactory {
 
-    @Value("${green.manager.id}")
-    private static String regionalManagerId;
-
-    @Value("${green.agency.id}")
-    private static String agencyId;
+//    @Value("${green.manager.id}")
+//    private static String regionalManagerId;
+//
+//    @Value("${green.agency.id}")
+//    private static String agencyId;
 
     public static CrowdTestProject createCrowdTestProject() {
         return new CrowdTestProject();

site/src/main/java/com/mooctest/crowd/site/mediator/impl/WebMediatorImpl.java

@@ -410,6 +410,8 @@ public class WebMediatorImpl implements ViewMediator {
                     CrowdProjectVO projectVO = new CrowdProjectVO(project);
                     if (project.getStatus() == CrowdTestProjectStatus.HAS_COMMITED)
                         projectVO.setNeedHandle(true);
+                    // 应用类型值的转换
+                    projectVO = changeApplicationType(projectVO);
                     return projectVO;
                 }).collect(Collectors.toList());
         //对于区域管理员
@@ -421,6 +423,7 @@ public class WebMediatorImpl implements ViewMediator {
                 CrowdTestProject project = new CrowdTestProject();
                 BeanUtils.copyProperties(crowdTestProjectPO, project);
                 CrowdProjectVO projectVO = new CrowdProjectVO(project);
+                projectVO = changeApplicationType(projectVO);
                 List<CrowdTestTaskPO> tasksOfProject = taskDao.findByCrowdTestProjectCodeAndIsDeleted(project.getCode(), DeletedStatus.isNotDeleted);
                 if (tasksOfProject != null && tasksOfProject.stream().anyMatch(task -> task.getStatus() == CrowdTestTaskStatus.HAS_COMMITED)) {
 //                    log.info("\n\n需要处理！！！\n\n");
@@ -441,7 +444,9 @@ public class WebMediatorImpl implements ViewMediator {
                     .map(crowdTestProjectPO -> {
                         CrowdTestProject project = new CrowdTestProject();
                         BeanUtils.copyProperties(crowdTestProjectPO, project);
-                        return new CrowdProjectVO(project);
+                        CrowdProjectVO projectVO = new CrowdProjectVO(project);
+                        projectVO = changeApplicationType(projectVO);
+                        return projectVO;
                     }).collect(Collectors.toList()));
             myCrowdDTO.setAcceptableProjectNoticeCount(Long.parseLong("" + acceptableProject.size()));
         }
@@ -465,6 +470,13 @@ public class WebMediatorImpl implements ViewMediator {
                             if (crowdTestTaskPO != null) {
                                 CrowdTestTask task = new CrowdTestTask();
                                 BeanUtils.copyProperties(crowdTestTaskPO, task);
+
+                                // 测试类型的转换
+                                Optional<TestTypePO> testTypePO = testTypeDao.findByCode(task.getType());
+                                if (!testTypePO.isPresent()) {
+                                    throw new HttpBadRequestException("请选择测试类型");
+                                }
+                                task.setType(testTypePO.get().getName());
                                 return task;
                             }
                             return null;
@@ -483,6 +495,17 @@ public class WebMediatorImpl implements ViewMediator {
         return myCrowdDTO;
     }
 
+    private CrowdProjectVO changeApplicationType(CrowdProjectVO projectVO) {
+        // 应用类型值的转换
+        Optional<ApplicationTypePO> applicationTypePO = applicationTypeDao.findByCode(projectVO.getPlatform());
+        if (applicationTypePO.isPresent()) {
+            projectVO.setPlatform(applicationTypePO.get().getName());
+        } else {
+            throw new HttpBadRequestException("请选择应用类型");
+        }
+        return projectVO;
+    }
+
 
     @Override
     public TaskSquareDTO renderTaskSquare() {
@@ -553,12 +576,7 @@ public class WebMediatorImpl implements ViewMediator {
                 .stream().filter(task -> task.getStatus() > CrowdTestTaskStatus.HAS_CREATED && task.getStatus() < CrowdTestTaskStatus.HAS_FINISHED).count()));
 
         // 应用类型值的转换
-        Optional<ApplicationTypePO> applicationTypePO = applicationTypeDao.findByCode(projectVO.getPlatform());
-        if(applicationTypePO.isPresent()){
-            projectVO.setPlatform(applicationTypePO.get().getName());
-        }else{
-            throw new HttpBadRequestException("请选择应用类型");
-        }
+        projectVO = changeApplicationType(projectVO);
 
         // 领域类型值的转换
         Optional<FieldPO> fieldPO = fieldDao.findByCode(projectVO.getField());
@@ -1123,6 +1141,7 @@ public class WebMediatorImpl implements ViewMediator {
                         }
                     }
                     if (project.getCrowdTestReportForProject() != null) {
+                        operationControl.setUploadReport(false);
                         operationControl.setFinish(true);
                     }
                 } else if (project.getStatus() == CrowdTestProjectStatus.HAS_COMMITED) {

site/src/main/resources/application.yml

@@ -190,8 +190,4 @@ user:
   service:
     baseUrl: http://user.cofortest.com
 website:
-  domain: cofortest.com
-
-green:
-  agency:
-    id: 50565
+  domain: cofortest.com