用户详情增加用户能力信息(字段都是新加的不会和原来冲突）。

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

@@ -35,6 +35,9 @@ public class User {
     private String unit;
     private String county;
     private List<Role> roleList;
+    private List<String> personAbilities;
+
+
 
     private RegionalManager regionalManager;
     private EvaluationAgency evaluationAgency;

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

@@ -26,6 +26,8 @@ import java.util.Optional;
 public class UserRepo implements IUserRepo {
     @Autowired
     private EvaluationAgencyDao agencyDao;
+    @Autowired
+    private  TestTypeDao testTypeDao;
 
     @Autowired
     private UserDao userDao;
@@ -78,6 +80,7 @@ public class UserRepo implements IUserRepo {
             throw new UserNotExistException("用户不存在");
         } else {
             User user = getUserAndRoleAndPermissionByUserPO(userPOOptional.get());
+
             return user;
         }
     }
@@ -409,7 +412,14 @@ public class UserRepo implements IUserRepo {
         if (enterpriseAuthenticationPO != null) {
             userResult.setEnterpriseAuthentication(Converter.convert(EnterpriseAuthentication.class, enterpriseAuthenticationPO));
         }
-
+        //获取用户能力
+         String []abilities=userPO.getPersonalCompetence().split(",");
+        List<String>  abailities= new ArrayList<>();
+        for(int i=0;i<abilities.length;i++){
+            String  abilityName=testTypeDao.findByCode(abilities[i]).get().getName();
+            abailities.add(abilityName);
+        }
+        userResult.setPersonAbilities(abailities);
         /*获取区域管理员信息*/
         List<RegionalManagerToRegionalPO> regionalManagerToRegionalPOList = regionalManagerToRegionalDao.findByUserIdAndIsDeleted(userPO.getId(), DeletedStatus.isNotDeleted);
         if (regionalManagerToRegionalPOList.size() > 0) {
@@ -438,6 +448,10 @@ public class UserRepo implements IUserRepo {
         return userResult;
     }
 
+
+
+
+
     private User getEvaluationInfo(User userResult) {
         /*获取测评机构信息*/
         EvaluationAgencyPO evaluationAgencyPO = evaluationAgencyDao.findByUserIdAndIsDeleted(userResult.getId(), DeletedStatus.isNotDeleted);
@@ -455,6 +469,10 @@ public class UserRepo implements IUserRepo {
             }
             evaluationAgencyResult.setEvaluationAgencyAbilityList(evaluationAgencyAbilityList);
 
+
+
+
+
             /*获取测评机构资源*/
             List<EvaluationAgencyResourcePO> evaluationAgencyResourcePOList = agencyResourceDao.findByEvaluationAgencyIdAndIsDeleted(evaluationAgencyResult.getId(), DeletedStatus.isNotDeleted);
             List<EvaluationAgencyResource> evaluationAgencyResourceList = new ArrayList<>();

site/src/main/java/com/mooctest/crowd/site/data/vo/UserVO.java

@@ -35,6 +35,7 @@ public class UserVO implements Serializable {
     private Long taskCount;
     private Date birthday;
     private List<String> personalCompetence;
+    private List<String> personAbilities;
     private String unit;
     private String county;
     private String address;

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

@@ -950,6 +950,7 @@ public class WebMediatorImpl implements ViewMediator {
         userDTO.setUserVO(new UserVO(user));
         userDTO.setAuthStatus(new StatusVO());
         userDTO.getAuthStatus().initUserAuthStatus(user);
+
         if (user.getEvaluationAgency() != null)
             userDTO.setAgencyVO(new AgencyVO(user.getEvaluationAgency()));
         if (user.getPersonalAuthentication() != null)