Преглед изворни кода

修复众测项目测试类型显示为code的问题

guo00guo пре 5 година
родитељ
комит
bb974c9bc9

+ 10 - 5
site/src/main/java/com/mooctest/crowd/site/mediator/impl/WebMediatorImpl.java

@@ -1078,7 +1078,11 @@ public class WebMediatorImpl implements ViewMediator {
         authingList.addAll(projectDao.findByNameLikeAndIsDeleted("%" + name + "%", DeletedStatus.isNotDeleted).stream().map(crowdTestProjectPO -> {
             CrowdTestProject crowdTestProject = new CrowdTestProject();
             BeanUtils.copyProperties(crowdTestProjectPO, crowdTestProject);
-            return new CrowdTestProjectVO(crowdTestProject);
+            // 项目测试类型转换
+            String applicationName = commonRepo.getApplicationNameByCode(crowdTestProjectPO.getApplicationType());
+            CrowdTestProjectVO crowdTestProjectVO = new CrowdTestProjectVO(crowdTestProject);
+            crowdTestProjectVO.setApplicationType(applicationName);
+            return crowdTestProjectVO;
         }).collect(Collectors.toList()).stream().sorted(Comparator.comparing(CrowdTestProjectVO::getCreateTime).reversed()).collect(Collectors.toList()));
         return authingList;
     }
@@ -1102,12 +1106,13 @@ public class WebMediatorImpl implements ViewMediator {
         List<CrowdTestProjectVO> authingList = new ArrayList<>();
         authingList.addAll(projectDao.findAll().stream().map(crowdTestProjectPO ->{
             CrowdTestProject crowdTestProject = new CrowdTestProject();
-//            if(crowdTestProject.getDeadTime().getTime() < System.currentTimeMillis()){
-//
-//            }
             BeanUtils.copyProperties(crowdTestProjectPO, crowdTestProject);
             themeStatusService.updateStatus(crowdTestProject);
-            return new CrowdTestProjectVO(crowdTestProject);
+            // 项目测试类型转换
+            String applicationName = commonRepo.getApplicationNameByCode(crowdTestProjectPO.getApplicationType());
+            CrowdTestProjectVO crowdTestProjectVO = new CrowdTestProjectVO(crowdTestProject);
+            crowdTestProjectVO.setApplicationType(applicationName);
+            return crowdTestProjectVO;
         }).collect(Collectors.toList()));
         return authingList;
     }

+ 5 - 3
site/src/main/java/com/mooctest/crowd/site/service/impl/CrowdProjectServiceImpl.java

@@ -101,10 +101,12 @@ public class CrowdProjectServiceImpl implements CrowdProjectService {
         List<CrowdTestProjectVO> authingList = new ArrayList<>();
         authingList.addAll(projectDao.findindexProject().stream().map(crowdTestProjectPO -> {
             CrowdTestProject crowdTestProject = new CrowdTestProject();
-//            String applicationName = commonRepo.getApplicationNameByCode(crowdTestProjectPO.getApplicationType());
-//            crowdTestProjectPO.setApplicationType(applicationName);
             BeanUtils.copyProperties(crowdTestProjectPO, crowdTestProject);
-            return new CrowdTestProjectVO(crowdTestProject);
+            // 项目测试类型转换
+            String applicationName = commonRepo.getApplicationNameByCode(crowdTestProjectPO.getApplicationType());
+            CrowdTestProjectVO crowdTestProjectVO = new CrowdTestProjectVO(crowdTestProject);
+            crowdTestProjectVO.setApplicationType(applicationName);
+            return crowdTestProjectVO;
         }).collect(Collectors.toList()));
         return authingList;
     }