增加普通用户可以接收项目

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

@@ -33,6 +33,7 @@ public class User {
     private EnterpriseAuthentication enterpriseAuthentication;
     private SystemAdministratorToUser systemAdministratorToUser;
     private List<Role> roleList;
+    private Anthentication anthentication;
 
     @Override
     public String toString() {

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

@@ -2,11 +2,11 @@ package com.mooctest.crowd.domain.repository;
 
 import com.mooctest.crowd.domain.dao.AgencyAbilityDao;
 import com.mooctest.crowd.domain.dao.AgencyResourceDao;
-import com.mooctest.crowd.domain.domainobject.DeletedStatus;
-import com.mooctest.crowd.domain.domainobject.EvaluationAgencyAbility;
-import com.mooctest.crowd.domain.domainobject.EvaluationAgencyResource;
+import com.mooctest.crowd.domain.dao.EvaluationAgencyDao;
+import com.mooctest.crowd.domain.domainobject.*;
 import com.mooctest.crowd.domain.exception.EvaluationAgencyResourceNotExist;
 import com.mooctest.crowd.domain.model.EvaluationAgencyAbilityPO;
+import com.mooctest.crowd.domain.model.EvaluationAgencyPO;
 import com.mooctest.crowd.domain.model.EvaluationAgencyResourcePO;
 import com.mooctest.crowd.domain.util.Converter;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -27,6 +27,20 @@ public class EvaluationAgencyRepo implements IEvaluationAgencyRepo {
 
     @Autowired
     private AgencyAbilityDao agencyAbilityDao;
+    
+    @Autowired
+    private EvaluationAgencyDao evaluationAgencyDao;
+
+    @Override
+    public EvaluationAgency findAgencyById(Long id){
+        System.out.println(id);
+        Optional<EvaluationAgencyPO> evaluationAgencyPO = evaluationAgencyDao.findById(id);
+        if(!evaluationAgencyPO.isPresent()){
+            throw new EvaluationAgencyResourceNotExist("测评信息不存在");
+        }else{
+            return Converter.convert(EvaluationAgency.class, evaluationAgencyPO.get());
+        }
+    }
 
     @Override
     public EvaluationAgencyResource findById(Long id){
@@ -72,6 +86,12 @@ public class EvaluationAgencyRepo implements IEvaluationAgencyRepo {
         return Converter.convert(EvaluationAgencyAbility.class, evaluationAgencyAbilityPO);
     }
 
+    @Override
+    public List<EvaluationAgencyAbility> findEvaluationAgencyAbility(Long evaluationAgencyId){
+        List<EvaluationAgencyAbilityPO> evaluationAgencyAbilityPOList = agencyAbilityDao.findByEvaluationAgencyIdAndIsDeleted(evaluationAgencyId, DeletedStatus.isNotDeleted);
+        return evaluationAgencyAbilityPOList.stream().map(evaluationAgencyAbilityPO -> Converter.convert(EvaluationAgencyAbility.class, evaluationAgencyAbilityPO)).collect(Collectors.toList());
+    }
+
 //    public List<EvaluationAgencyAbility> saveAllAbility(List<EvaluationAgencyAbility> abilityList){
 //        List<EvaluationAgencyAbilityPO> evaluationAgencyAbilityPOList = agencyAbilityDao.saveAll(abilityList.stream().map(source -> Converter.convert(EvaluationAgencyAbilityPO.class, source)).collect(Collectors.toList()));
 //        return evaluationAgencyAbilityPOList.stream().map(abilityPO -> Converter.convert(EvaluationAgencyAbility.class, abilityPO)).collect(Collectors.toList());

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

@@ -1,5 +1,6 @@
 package com.mooctest.crowd.domain.repository;
 
+import com.mooctest.crowd.domain.domainobject.EvaluationAgency;
 import com.mooctest.crowd.domain.domainobject.EvaluationAgencyAbility;
 import com.mooctest.crowd.domain.domainobject.EvaluationAgencyResource;
 
@@ -11,6 +12,8 @@ import java.util.List;
  */
 public interface IEvaluationAgencyRepo {
 
+    EvaluationAgency findAgencyById(Long id);
+
     EvaluationAgencyResource findById(Long id);
 
     List<EvaluationAgencyResource> findByEvaluationAgencyId(Long evaluationAgencyId);
@@ -21,5 +24,7 @@ public interface IEvaluationAgencyRepo {
 
     EvaluationAgencyAbility saveEvaluationAgencyAbility(EvaluationAgencyAbility EvaluationAgencyAbility);
 
+    List<EvaluationAgencyAbility> findEvaluationAgencyAbility(Long evaluationAgencyId);
+
     void moveEvaluationAgencyAbility(List<EvaluationAgencyAbility> evaluationAgencyAbilityList);
 }

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

@@ -80,6 +80,7 @@ public class UserController {
             throw new UnauthorizedException("没有权限对他人账号进行操作！");
         if (result.hasErrors())
             throw new BaseException(result.getFieldError().getDefaultMessage());
+
         return userService.applyPersonalAuth(userId, command);
     }
 

site/src/main/java/com/mooctest/crowd/site/data/dto/UserDTO.java

@@ -1,7 +1,6 @@
 package com.mooctest.crowd.site.data.dto;
 
 import com.mooctest.crowd.site.data.vo.*;
-import com.mooctest.crowd.domain.domainobject.Permission;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;

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

@@ -470,7 +470,7 @@ public class WebMediatorImpl implements ViewMediator {
             }
         }
         //评测机构视角
-        if (user.getRoleList().stream().anyMatch(role -> role.getName().equals("evaluationAgency")) && task.getStatus()!=CrowdTestTaskStatus.HAS_REJECTED){
+        if (user.getRoleList().stream().anyMatch(role -> role.getName().equals("evaluationAgency") || role.getName().equals("generalUser")) && task.getStatus()!=CrowdTestTaskStatus.HAS_REJECTED){
             if ((task.getDistributionType()==0 && task.getEvaluationAgencyId().equals(user.getId()))
                     ||(task.getDistributionType()==2 && task.getStatus()>=CrowdTestTaskStatus.HAS_RECEIVED && task.getEvaluationAgencyId().equals(user.getId()))){
                 if (task.getStatus()==CrowdTestTaskStatus.HAS_RELEASED){

site/src/main/resources/application.yml

@@ -1,6 +1,7 @@
 spring:
   profiles:
-    active: online
+    active: dev
+  #    active: online
   cache:
     guava:
       spec: expireAfterWrite=30s