Merge branch 'Dev' into 'Test'

Dev

See merge request crowd-2019/crowd-test-service-backend!109

core/src/main/java/com/mooctest/crowd/domain/repository/CommonRepo.java

@@ -226,7 +226,6 @@ public class CommonRepo {
                             cb.like(a.<String>get("name"), "%" + StringUtils.trim(keyword) + "%")
                     );
                 }
-                predicate.getExpressions().add(cb.equal(a.<String>get("isDeleted"), 0));
 //                q.orderBy(cb.desc(a.get("status").as(Integer.class)));
                 return predicate;
             }

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

@@ -1055,8 +1055,11 @@ public class WebMediatorImpl implements ViewMediator {
     public List<CrowdTaskVO> findTaskByNameLike(String name) {
         List<CrowdTaskVO> authingList = new ArrayList<>();
         authingList.addAll(taskDao.findByNameLike("%" + name + "%").stream().map(crowdTestTaskPO -> {
+            //根据code值查询出来该任务的type
+            Optional<TestTypePO> serviceType = testTypeDao.findByCode(crowdTestTaskPO.getType());
             CrowdTestTask crowdTestTask = new CrowdTestTask();
             BeanUtils.copyProperties(crowdTestTaskPO, crowdTestTask);
+            crowdTestTask.setType(serviceType.get().getName());
             return new CrowdTaskVO(crowdTestTask);
         }).collect(Collectors.toList()));
         return authingList;
@@ -1078,7 +1081,7 @@ public class WebMediatorImpl implements ViewMediator {
     }
 
     /**
-     * 更多热门任务
+     * 更多热门项目
      * @return
      */
     @Override
@@ -1087,15 +1090,7 @@ public class WebMediatorImpl implements ViewMediator {
         authingList.addAll(projectDao.findall().stream().map(crowdTestProjectPO -> {
             CrowdTestProject crowdTestProject = new CrowdTestProject();
             BeanUtils.copyProperties(crowdTestProjectPO, crowdTestProject);
-            // 应用类型值的转换
-            Optional<ApplicationTypePO> applicationTypePO = applicationTypeDao.findByCode(crowdTestProject.getApplicationType());
-            if (applicationTypePO.isPresent()) {
-                crowdTestProject.setApplicationType(applicationTypePO.get().getName());
-            } else {
-                throw new HttpBadRequestException("请选择应用类型");
-            }
             return new CrowdTestProjectVO(crowdTestProject);
-
         }).collect(Collectors.toList()));
         return authingList;
     }
@@ -1548,7 +1543,7 @@ public class WebMediatorImpl implements ViewMediator {
                         operationControl.setUploadReport(false);
                     } else {
                         if (project.getCrowdTestTaskList()
-                                .stream().allMatch(task -> task.getStatus() == CrowdTestTaskStatus.HAS_REJECTED || task.getStatus() == CrowdTestTaskStatus.HAS_FINISHED)) {
+                                .stream().allMatch(task -> task.getStatus() == CrowdTestTaskStatus.HAS_REJECTED || task.getStatus() == CrowdTestTaskStatus.HAS_FINISHED || task.getStatus() == CrowdTestTaskStatus.HAS_TIME_OUT)) {
                             operationControl.setUploadReport(true);
                         }
                     }

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

@@ -42,7 +42,7 @@ public class AuthCheckServiceImpl{
 
     public static Boolean canAcceptTask(User user) {
         if(user.getRoleList().stream().anyMatch(role -> role.getName().equals(RoleType.AGENCY.getName()) ||
-                role.getName().equals(RoleType.ENTERPRISE_USER.getName()) ||
+                role.getName().equals(RoleType.EVALUATION_USER.getName()) ||
                 role.getName().equals(RoleType.SYSTEM_ADMIN.getName()) ||
                 role.getName().equals(RoleType.REGIONAL_MANAGER.getName()))){
             return true;

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

@@ -101,6 +101,8 @@ 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);
         }).collect(Collectors.toList()));
@@ -269,6 +271,7 @@ public class CrowdProjectServiceImpl implements CrowdProjectService {
             project.setUserId(userId);
             project.setJoinCount(1);
             project.setRestPrice(0.0);
+            project.setStatus(CrowdTestProjectStatus.HAS_FINISHED);
             project.setCreateTime(new Timestamp(System.currentTimeMillis() - 1000));
 //            project.setProjectDistributionTypeId(0L);
 //            project.setRegionalManagerId();
@@ -292,6 +295,7 @@ public class CrowdProjectServiceImpl implements CrowdProjectService {
             task.setParticipantHasCommittedCount(1);
             task.setCreateTime(project.getCreateTime());
             task.setEndTime(project.getEndTime());
+            task.setStatus(CrowdTestTaskStatus.HAS_FINISHED);
 //            if (user.getEvaluationAgency() == null)
 //                task.setEvaluationAgencyId(1L);
 //            else
@@ -372,6 +376,9 @@ public class CrowdProjectServiceImpl implements CrowdProjectService {
         for(CrowdTestTask crowdTestTask : crowdTestTasks) {
             List<TaskToUser> acceptedUserList = crowdTestTask.getAcceptedUserList();
             for (TaskToUser taskToUser : acceptedUserList) {
+                if(taskToUser.getHasReport() == 0){
+                    continue;
+                }
                 User user = userRepo.getByID(taskToUser.getUserId());
 
                 // 对用户判断认证类型 测评机构为2 测试人员为6

site/src/main/resources/application.yml

@@ -95,7 +95,7 @@ website:
 spring:
   profiles: dev-localhost
   datasource:
-    url: jdbc:mysql://101.37.175.111:3306/crowd-test-service-pre?useSSL=false&useUnicode=yes&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai
+    url: jdbc:mysql://101.37.175.111:3306/crowd-test-service?useSSL=false&useUnicode=yes&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai
     username: mooctest
     password: secr3t!
   redis: