修改个人认证和企业认证接口

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

@@ -13,8 +13,8 @@ import java.sql.Timestamp;
  */
 @Data
 public class EnterpriseAuthentication {
-    private  String isDaOrEa;//是研发机构还是评测机构
-    private  String   enterpriseName;
+    private String isDaOrEa;//是研发机构还是评测机构
+    private String enterpriseName;
     private Long id;
     private Long userId;
     private String IDCardNum;//身份证号码
@@ -31,17 +31,15 @@ public class EnterpriseAuthentication {
     private Timestamp applyTime;
     private Timestamp checkTime;
     private Timestamp IDCardDeadTime;//身份证过期时间
-
+    private String type;
 
 
     public EnterpriseAuthentication getByPo(EnterpriseAuthenticationPO enterpriseAuthenticationPO) {
         this.applyTime = enterpriseAuthenticationPO.getApplyTime();
         this.businessLicensePhoto = enterpriseAuthenticationPO.getBusinessLicensePhoto();
-
         this.legalPersonName = enterpriseAuthenticationPO.getLegalPersonName();
-
-         return this;
-
+        BeanUtils.copyProperties(enterpriseAuthenticationPO, this);
+        return this;
     }
 
 

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

@@ -33,6 +33,7 @@ public class EvaluationAgency {
     private Timestamp expireTime;
     private Timestamp checkTime;
     private Timestamp applyTime;
+    private String type;
 
 //    public EvaluationAgency(EvaluationAgencyPO evaluationAgencyPO) {
 //        BeanUtils.copyProperties(evaluationAgencyPO, this,"evaluationAgencyResourceList", "evaluationAgencyAbilityList");
@@ -48,6 +49,8 @@ public class EvaluationAgency {
         expireTime=evaluationAgencyPO.getExpireTime();
         checkTime=evaluationAgencyPO.getCheckTime();
         applyTime=evaluationAgencyPO.getApplyTime();
+        BeanUtils.copyProperties(evaluationAgencyPO, this);
+
     }
 
     public EvaluationAgency applyAuthentication(Long userId) {

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

@@ -12,12 +12,13 @@ import java.sql.Timestamp;
  * @date 2019-08-19 15:47
  */
 @Data
-public class PersonalAuthentication{
+public class PersonalAuthentication {
 
     private Long id;
     private Long userId;
     private String realName;
     private String IDCard;
+    private String IDCardPhoto;
     private String IDCardPositivePhoto;//身份证正面照片
     private String IDCardBackPhoto;//身份证反面照片
     private String sex;
@@ -29,26 +30,27 @@ public class PersonalAuthentication{
     private Timestamp applyTime;
     private Timestamp checkTime;
     private Timestamp IDCardDeadTime;//身份证过期时间
+    private String type;
 
     /**
      * 转换类型
+     *
      * @param authenticationPO
      * @return
      */
-
-    public  PersonalAuthentication  getByPo(PersonalAuthenticationPO authenticationPO){
-          this.realName=authenticationPO.getRealName();
-          this.address=authenticationPO.getAddress();
-          this.applyTime=authenticationPO.getApplyTime();
-          this.IDCard=authenticationPO.getIDCard();
-          this.IDCardBackPhoto=authenticationPO.getIDCardPhoto();
-          return this;
+    public PersonalAuthentication getByPo(PersonalAuthenticationPO authenticationPO) {
+        BeanUtils.copyProperties(authenticationPO, this);
+        return this;
+//        this.realName = authenticationPO.getRealName();
+//        this.address = authenticationPO.getAddress();
+//        this.applyTime = authenticationPO.getApplyTime();
+//        this.IDCard = authenticationPO.getIDCard();
+//        this.IDCardBackPhoto = authenticationPO.getIDCardPhoto();
+//        this.type = authenticationPO.getType();
 
     }
 
-
-
-    public PersonalAuthentication applyAuthentication(Long userId){
+    public PersonalAuthentication applyAuthentication(Long userId) {
         this.setUserId(userId);
         this.setIsAuthentication(AuthenticationStatus.isAuthenIng);
         this.setIsDeleted(DeletedStatus.isNotDeleted);
@@ -59,11 +61,11 @@ public class PersonalAuthentication{
     }
 
     public PersonalAuthentication passAuthentication() {
-        if(this.getIsAuthentication() == AuthenticationStatus.isNotAuthenticated){
+        if (this.getIsAuthentication() == AuthenticationStatus.isNotAuthenticated) {
             throw new BaseException("当前是未通过认证状态，不可通过认证，需对认证信息进行修改后再提交认证申请");
-        }else if(this.getIsAuthentication() == AuthenticationStatus.isAuthenticated){
+        } else if (this.getIsAuthentication() == AuthenticationStatus.isAuthenticated) {
             throw new BaseException("当前已通过认证，请勿重复操作");
-        }else{
+        } else {
             this.setIsAuthentication(AuthenticationStatus.isAuthenticated);
             this.setCheckTime(new Timestamp(System.currentTimeMillis()));
             this.setExplain("");
@@ -73,14 +75,14 @@ public class PersonalAuthentication{
     }
 
     public PersonalAuthentication rejectAuthentication(String explain) {
-        if(this.getIsDeleted() == DeletedStatus.isDeleted){
+        if (this.getIsDeleted() == DeletedStatus.isDeleted) {
             throw new BaseException("当前认证信息已被删除，不可做认证状态改变操作");
-        }else {
-            if(this.getIsAuthentication() == AuthenticationStatus.isNotAuthenticated){
+        } else {
+            if (this.getIsAuthentication() == AuthenticationStatus.isNotAuthenticated) {
                 throw new BaseException("当前已是未通过认证状态，不可再次拒绝认证");
-            }else if(this.getIsAuthentication() == AuthenticationStatus.isAuthenticated){
+            } else if (this.getIsAuthentication() == AuthenticationStatus.isAuthenticated) {
                 throw new BaseException("当前已通过认证，不可拒绝认证");
-            }else {
+            } else {
                 this.setIsAuthentication(AuthenticationStatus.isNotAuthenticated);
                 this.setExplain(explain);
                 this.setCheckTime(new Timestamp(System.currentTimeMillis()));
@@ -92,7 +94,7 @@ public class PersonalAuthentication{
     public PersonalAuthentication updateAuthInfo(PersonalAuthentication modifyAuth) {
         modifyAuth.userId = this.userId;
         modifyAuth.id = this.id;
-        BeanUtils.copyProperties(modifyAuth,this);
+        BeanUtils.copyProperties(modifyAuth, this);
         this.setIsAuthentication(AuthenticationStatus.isAuthenIng);
         this.setIsDeleted(DeletedStatus.isNotDeleted);
         this.setApplyTime(new Timestamp(System.currentTimeMillis()));

core/src/main/java/com/mooctest/crowd/domain/model/EnterpriseAuthenticationPO.java

@@ -55,10 +55,13 @@ public class EnterpriseAuthenticationPO {
     @Column(name = "DA_APPLY_TIME")
     private Timestamp applyTime;
 
-
     @Column(name = "DA_ID_CARD_BACK_PHOTO")
     private String idCardBackPhoto;
+
     @Column(name = "DA_ID_CARD_POS_PHOTO")
     private String idCardPositivePhoto;
 
+    @Column(name = "DA_TYPE")
+    private String type;
+
 }

core/src/main/java/com/mooctest/crowd/domain/model/EvaluationAgencyPO.java

@@ -53,4 +53,8 @@ public class EvaluationAgencyPO{
 
     @Column(name = "EA_CHECK_TIME")
     private Timestamp checkTime;
+
+    @Column(name = "EA_TYPE")
+    private String type;
+
 }

core/src/main/java/com/mooctest/crowd/domain/model/PersonalAuthenticationPO.java

@@ -55,18 +55,15 @@ public class PersonalAuthenticationPO {
     @Column(name = "PA_ID_CARD_POS_PHOTO")
     private String  IDCardPositivePhoto;//身份证正面照片
 
-
     @Column(name = "PA_ID_CARD_BACK_PHOTO")
     private String  IDCardBackPhoto;//身份证正面照片
 
-
     @Column(name = "PA_EXPIRE_TIME")
     private Timestamp  IDCardDeadTime;
 
-
     @Column(name = "PA_Sex")
     private  String  sex;
 
-
-
+    @Column(name = "PA_TYPE")
+    private String type;
 }

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

@@ -25,7 +25,7 @@ import java.util.Optional;
 @Component
 public class UserRepo implements IUserRepo {
     @Autowired
-    private  EvaluationAgencyDao agencyDao;
+    private EvaluationAgencyDao agencyDao;
 
     @Autowired
     private UserDao userDao;
@@ -76,7 +76,7 @@ public class UserRepo implements IUserRepo {
         Optional<UserPO> userPOOptional = userDao.findById(userId);
         if (!userPOOptional.isPresent()) {
             throw new UserNotExistException("用户不存在");
-        }else{
+        } else {
             User user = getUserAndRoleAndPermissionByUserPO(userPOOptional.get());
             return user;
         }
@@ -87,7 +87,7 @@ public class UserRepo implements IUserRepo {
         Optional<UserPO> userPOOptional = userDao.findById(userId);
         if (!userPOOptional.isPresent()) {
             throw new UserNotExistException("用户不存在");
-        }else{
+        } else {
             User user = getUserAndRoleAndPermissionByUserPO(userPOOptional.get());
             return this.getEvaluationInfo(user);
         }
@@ -98,7 +98,7 @@ public class UserRepo implements IUserRepo {
         Optional<UserPO> userPOOptional = userDao.findById(userId);
         if (!userPOOptional.isPresent()) {
             throw new UserNotExistException("用户不存在");
-        }else{
+        } else {
             return Converter.convert(User.class, userPOOptional.get());
         }
     }
@@ -108,7 +108,7 @@ public class UserRepo implements IUserRepo {
         UserPO userPO = userDao.findByMobile(mobileNum);
         if (userPO == null) {
             throw new UserNotExistException("用户不存在");
-        }else {
+        } else {
             User user = getUserAndRoleAndPermissionByUserPO(userPO);
             return user;
         }
@@ -124,11 +124,12 @@ public class UserRepo implements IUserRepo {
 
     /**
      * 获取机构认证的申请
+     *
      * @return
      * @throws RoleNotFoundException
      */
     @Override
-    public List<User> getApplyEvaluationAgencyByIsAuthenticated(){
+    public List<User> getApplyEvaluationAgencyByIsAuthenticated() {
         List<UserPO> userPOList = new ArrayList<>();
         evaluationAgencyDao.findByIsAuthentication(AuthenticationStatus.isNotAuthenticated).forEach(evaluationAgencyPO -> {
             userPOList.add(userDao.findById(evaluationAgencyPO.getUserId()).get());
@@ -146,18 +147,18 @@ public class UserRepo implements IUserRepo {
     }
 
     @Override
-    public ArrayList<UserPO> getAllUserInfo() throws RoleNotFoundException{
+    public ArrayList<UserPO> getAllUserInfo() throws RoleNotFoundException {
         Iterable<UserPO> allUserPO = userDao.findAll();
         ArrayList<UserPO> userPOArrayList = Lists.newArrayList(allUserPO);
         return userPOArrayList;
     }
 
     @Override
-    public UserTaskCount getUserTaskCountByUserId(Long userId){
+    public UserTaskCount getUserTaskCountByUserId(Long userId) {
         Optional<UserTaskCountPO> userTaskCountPO = userTaskCountDao.findByUserId(userId);
-        if(!userTaskCountPO.isPresent()){
+        if (!userTaskCountPO.isPresent()) {
             return null;
-        }else{
+        } else {
             return Converter.convert(UserTaskCount.class, userTaskCountPO.get());
         }
     }
@@ -202,6 +203,7 @@ public class UserRepo implements IUserRepo {
 
     /**
      * 注册用户时默认为普通用户，分配角色后存入数据库
+     *
      * @param user
      * @return
      */
@@ -214,7 +216,7 @@ public class UserRepo implements IUserRepo {
         // 存储从数据库中取出的User的Role数据
         List<Role> roleListResult = new ArrayList<>();
 
-        for(Role role : roleList){
+        for (Role role : roleList) {
             RolePO rolePO = roleDao.findByName(role.getName());
             Role roleConvert = Converter.convert(Role.class, rolePO);
 
@@ -233,6 +235,7 @@ public class UserRepo implements IUserRepo {
 
     /**
      * 保存用户相关的所有信息（包括测评机构信息、角色信息、权限信息）
+     *
      * @param user
      * @return
      * @throws RoleNotFoundException
@@ -245,7 +248,8 @@ public class UserRepo implements IUserRepo {
 
 
     /**
-     *保存用户信息（包括测评机构信息、角色信息、权限信息）
+     * 保存用户信息（包括测评机构信息、角色信息、权限信息）
+     *
      * @param user
      * @return
      * @throws RoleNotFoundException
@@ -253,15 +257,15 @@ public class UserRepo implements IUserRepo {
     private User saveRoleAndPermissionAndEvaluationAgencyByUser(User user) throws RoleNotFoundException {
         UserPO userPO = userDao.save(Converter.convert(UserPO.class, user));
         List<Role> roleList = user.getRoleList();
-        if (roleList==null || roleList.size()==0){
+        if (roleList == null || roleList.size() == 0) {
             UserToRolePO u2r = new UserToRolePO();
             u2r.setUserId(userPO.getId());
             u2r.setRoleId(1L);
             userToRoleDao.save(u2r);
         }
         List<UserToRolePO> userToRolePOList = userToRoleDao.findByUserId(userPO.getId());
-        if(roleList != null){
-            for(Role role : roleList){
+        if (roleList != null) {
+            for (Role role : roleList) {
                 if (userToRolePOList.stream().noneMatch(userToRolePO -> userToRolePO.getRoleId().equals(role.getId()))) {
                     UserToRolePO userToRolePO = new UserToRolePO();
                     userToRolePO.setRoleId(role.getId());
@@ -273,7 +277,7 @@ public class UserRepo implements IUserRepo {
 
         /*机构认证保存机构信息*/
         EvaluationAgency evaluationAgency = user.getEvaluationAgency();
-        if(evaluationAgency != null){
+        if (evaluationAgency != null) {
             EvaluationAgencyPO evaluationAgencyPO = Converter.convert(EvaluationAgencyPO.class, evaluationAgency);
             evaluationAgencyPO.setUserId(userPO.getId());
             evaluationAgencyPO = evaluationAgencyDao.save(evaluationAgencyPO);
@@ -297,54 +301,49 @@ public class UserRepo implements IUserRepo {
         }
 
         /*实名认证保存个人信息*/
-        if(user.getPersonalAuthentication() != null){
-            System.out.println("认证消息为==========="+user.getPersonalAuthentication());
+        if (user.getPersonalAuthentication() != null) {
             PersonalAuthenticationPO authenticationPO = Converter.convert(PersonalAuthenticationPO.class, user.getPersonalAuthentication());
-            System.out.println("认证消息为PO==========="+authenticationPO);
             personalAuthenticationDao.save(authenticationPO);
         }
 
         /*企业认证保存企业信息*/
-        if(user.getEnterpriseAuthentication() != null){
-            if(user.getEnterpriseAuthentication().getIsDaOrEa().equals("研发机构")){
-                System.out.println("认证消息为==========="+user.getPersonalAuthentication());
-                EnterpriseAuthenticationPO authenticationPO = Converter.convert(EnterpriseAuthenticationPO.class, user.getEnterpriseAuthentication());
-                System.out.println("认证消息为PO==========="+authenticationPO);
-            enterpriseAuthenticationDao.save(authenticationPO);
-        }
-
-
-            else if(user.getEnterpriseAuthentication().getIsDaOrEa().equals("评测机构")){
-                EvaluationAgencyPO evaluationAgencyPO=new EvaluationAgencyPO();
-                 evaluationAgencyPO.setUserId(user.getId());
-                 evaluationAgencyPO.setAddress(user.getEnterpriseAuthentication().getAddress());
-                 evaluationAgencyPO.setEvaluationAgencyName(user.getEnterpriseAuthentication().getEnterpriseName());
-                 evaluationAgencyPO.setUpdateTime(new Timestamp(System.currentTimeMillis()));
-                agencyDao.save(evaluationAgencyPO);
-            }
-
-
-            }
+//        if (user.getEnterpriseAuthentication() != null) {
+////            if (user.getEnterpriseAuthentication().getType().contains("研发机构")) {
+////                System.out.println("认证消息为===========" + user.getPersonalAuthentication());
+////                EnterpriseAuthenticationPO authenticationPO = Converter.convert(EnterpriseAuthenticationPO.class, user.getEnterpriseAuthentication());
+////                System.out.println("认证消息为PO===========" + authenticationPO);
+////                enterpriseAuthenticationDao.save(authenticationPO);
+////            }
+////            else if (user.getEnterpriseAuthentication().getIsDaOrEa().equals("评测机构")) {
+//                EvaluationAgencyPO evaluationAgencyPO = new EvaluationAgencyPO();
+//                evaluationAgencyPO.setUserId(user.getId());
+//                evaluationAgencyPO.setAddress(user.getEnterpriseAuthentication().getAddress());
+//                evaluationAgencyPO.setEvaluationAgencyName(user.getEnterpriseAuthentication().getEnterpriseName());
+//                evaluationAgencyPO.setUpdateTime(new Timestamp(System.currentTimeMillis()));
+//                agencyDao.save(evaluationAgencyPO);
+////            }
+//        }
 
         return getByID(userPO.getId());
     }
 
     /**
      * 通过角色获取角色和权限信息
+     *
      * @param roleResult
      * @return
      */
     private Role getPermissionByRole(Role roleResult) {
         List<Permission> permissionResultList = new ArrayList<>();
         List<RoleToPermissionPO> roleToPermissionPOList = roleToPermissionDao.findAllByRoleId(roleResult.getId());
-        for(RoleToPermissionPO roleToPermissionPO : roleToPermissionPOList){
+        for (RoleToPermissionPO roleToPermissionPO : roleToPermissionPOList) {
             Long permissionId = roleToPermissionPO.getPermissionId();
             Optional<PermissionPO> permissionPOOptional = permissionDao.findById(permissionId);
-            if(!permissionPOOptional.isPresent()){
+            if (!permissionPOOptional.isPresent()) {
                 throw new PermissionNotFoundException();
-            }else{
+            } else {
                 PermissionPO permissionPO = permissionPOOptional.get();
-                permissionResultList.add(Converter.convert(Permission.class,permissionPO));
+                permissionResultList.add(Converter.convert(Permission.class, permissionPO));
             }
         }
         roleResult.setPermissionList(permissionResultList);
@@ -353,13 +352,14 @@ public class UserRepo implements IUserRepo {
 
     /**
      * 通过UsePOList获取用户-角色-权限信息
+     *
      * @param userPOList
      * @return
      * @throws RoleNotFoundException
      */
     private List<User> getUserAndRoleAndPermissionListByUserPOList(List<UserPO> userPOList) throws RoleNotFoundException {
         List<User> userList = new ArrayList<>();
-        for(UserPO userPO : userPOList){
+        for (UserPO userPO : userPOList) {
             User userAndRole = getUserAndRoleAndPermissionByUserPO(userPO);
             userList.add(userAndRole);
         }
@@ -368,22 +368,23 @@ public class UserRepo implements IUserRepo {
 
     /**
      * 通过用户信息获取用户-角色-权限信息
+     *
      * @param userPO
      * @return
      * @throws RoleNotFoundException
      */
-    private User getUserAndRoleAndPermissionByUserPO(UserPO userPO) throws RoleNotFoundException{
+    private User getUserAndRoleAndPermissionByUserPO(UserPO userPO) throws RoleNotFoundException {
         User userResult = Converter.convert(User.class, userPO);
         List<UserToRolePO> userToRolePOList = userToRoleDao.findByUserId(userResult.getId());
         List<Role> roleResultList = new ArrayList<>();
         for (UserToRolePO userToRolePO : userToRolePOList) {
             Optional<RolePO> rolePOOptional = roleDao.findById(userToRolePO.getRoleId());
-            if(rolePOOptional.isPresent()){
+            if (rolePOOptional.isPresent()) {
                 RolePO rolePO = rolePOOptional.get();
                 // 权限
                 Role roleResult = getPermissionByRole(Converter.convert(Role.class, rolePO));
                 roleResultList.add(roleResult);
-            }else{
+            } else {
                 throw new RoleNotFoundException();
             }
         }
@@ -392,24 +393,24 @@ public class UserRepo implements IUserRepo {
 
         /*获取个人认证的信息*/
         PersonalAuthenticationPO personalAuthenticationPO = personalAuthenticationDao.findByUserIdAndIsDeleted(userPO.getId(), DeletedStatus.isNotDeleted);
-        if(personalAuthenticationPO != null){
+        if (personalAuthenticationPO != null) {
             userResult.setPersonalAuthentication(Converter.convert(PersonalAuthentication.class, personalAuthenticationPO));
         }
 
         /*获取企业认证的信息*/
         EnterpriseAuthenticationPO enterpriseAuthenticationPO = enterpriseAuthenticationDao.findByUserIdAndIsDeleted(userPO.getId(), DeletedStatus.isNotDeleted);
-        if(enterpriseAuthenticationPO != null){
+        if (enterpriseAuthenticationPO != null) {
             userResult.setEnterpriseAuthentication(Converter.convert(EnterpriseAuthentication.class, enterpriseAuthenticationPO));
         }
 
         /*获取区域管理员信息*/
         List<RegionalManagerToRegionalPO> regionalManagerToRegionalPOList = regionalManagerToRegionalDao.findByUserIdAndIsDeleted(userPO.getId(), DeletedStatus.isNotDeleted);
-        if(regionalManagerToRegionalPOList.size() > 0){
+        if (regionalManagerToRegionalPOList.size() > 0) {
             List<RegionalManagerToRegional> regionalList = new ArrayList<>();
             RegionalManager regionalManager = new RegionalManager();
             regionalManager.setUserId(userPO.getId());
-            for(RegionalManagerToRegionalPO regionalManagerToRegionalPO : regionalManagerToRegionalPOList){
-                if(regionalManagerToRegionalPO != null){
+            for (RegionalManagerToRegionalPO regionalManagerToRegionalPO : regionalManagerToRegionalPOList) {
+                if (regionalManagerToRegionalPO != null) {
                     regionalManager.setId(regionalManagerToRegionalPO.getId());
                     /*获取区域管理员管理的区域信息*/
                     RegionalManagerToRegional regionalResult = Converter.convert(RegionalManagerToRegional.class, regionalManagerToRegionalPO);
@@ -423,7 +424,7 @@ public class UserRepo implements IUserRepo {
 
         //获取系统管理员信息
         SystemAdministratorToUserPO systemAdministratorToUserPO = systemAdministratorToUserDao.findByUserIdAndIsDeleted(userPO.getId(), DeletedStatus.isNotDeleted);
-        if(systemAdministratorToUserPO != null){
+        if (systemAdministratorToUserPO != null) {
             userResult.setSystemAdministratorToUser(Converter.convert(SystemAdministratorToUser.class, systemAdministratorToUserPO));
         }
 
@@ -433,14 +434,14 @@ public class UserRepo implements IUserRepo {
     private User getEvaluationInfo(User userResult) {
         /*获取测评机构信息*/
         EvaluationAgencyPO evaluationAgencyPO = evaluationAgencyDao.findByUserIdAndIsDeleted(userResult.getId(), DeletedStatus.isNotDeleted);
-        if(evaluationAgencyPO != null){
+        if (evaluationAgencyPO != null) {
             EvaluationAgency evaluationAgencyResult = Converter.convert(EvaluationAgency.class, evaluationAgencyPO);
 
             /*获取测评机构能力*/
             List<EvaluationAgencyAbilityPO> evaluationAgencyAbilityPOList = agencyAbilityDao.findByEvaluationAgencyIdAndIsDeleted(evaluationAgencyResult.getId(), DeletedStatus.isNotDeleted);
             List<EvaluationAgencyAbility> evaluationAgencyAbilityList = new ArrayList<>();
-            if(evaluationAgencyAbilityPOList.size() != 0){
-                for(EvaluationAgencyAbilityPO evaluationAgencyAbilityPO : evaluationAgencyAbilityPOList){
+            if (evaluationAgencyAbilityPOList.size() != 0) {
+                for (EvaluationAgencyAbilityPO evaluationAgencyAbilityPO : evaluationAgencyAbilityPOList) {
                     EvaluationAgencyAbility evaluationAgencyAbility = Converter.convert(EvaluationAgencyAbility.class, evaluationAgencyAbilityPO);
                     evaluationAgencyAbilityList.add(evaluationAgencyAbility);
                 }
@@ -450,8 +451,8 @@ public class UserRepo implements IUserRepo {
             /*获取测评机构资源*/
             List<EvaluationAgencyResourcePO> evaluationAgencyResourcePOList = agencyResourceDao.findByEvaluationAgencyIdAndIsDeleted(evaluationAgencyResult.getId(), DeletedStatus.isNotDeleted);
             List<EvaluationAgencyResource> evaluationAgencyResourceList = new ArrayList<>();
-            if(evaluationAgencyResourcePOList.size() != 0){
-                for(EvaluationAgencyResourcePO evaluationAgencyResourcePO : evaluationAgencyResourcePOList){
+            if (evaluationAgencyResourcePOList.size() != 0) {
+                for (EvaluationAgencyResourcePO evaluationAgencyResourcePO : evaluationAgencyResourcePOList) {
                     EvaluationAgencyResource evaluationAgencyResource = Converter.convert(EvaluationAgencyResource.class, evaluationAgencyResourcePO);
                     evaluationAgencyResourceList.add(evaluationAgencyResource);
                 }
@@ -462,21 +463,21 @@ public class UserRepo implements IUserRepo {
         return userResult;
     }
 
-    public Role getRole(String roleName){
+    public Role getRole(String roleName) {
         Role role = new Role();
         BeanUtils.copyProperties(roleDao.findByName(roleName), role);
         return role;
     }
 
-    public long getAllUserNum(){
+    public long getAllUserNum() {
         return userDao.count();
     }
 
-    public long getAllAgencyNum(){
+    public long getAllAgencyNum() {
         return evaluationAgencyDao.count();
     }
 
-    public long getAllResourceNum(){
+    public long getAllResourceNum() {
         return agencyResourceDao.count();
     }
 }

site/src/main/java/com/mooctest/crowd/site/command/ApplyAgencyAuthCommand.java

@@ -18,7 +18,7 @@ import java.util.stream.Collectors;
 public class ApplyAgencyAuthCommand {
     @NotNull(message = "机构名称不可为空")
     private String evaluationAgencyName;
-//    @NotNull(message = "银行卡号不可为空")
+    @NotNull(message = "银行卡号不可为空")
     private String bankAccount;
     @NotNull(message = "机构地址不可为空")
     private String address;
@@ -32,8 +32,15 @@ public class ApplyAgencyAuthCommand {
     public EvaluationAgency toAgency(){
         EvaluationAgency agency = UserFactory.defaultAgency();
         BeanUtils.copyProperties(this, agency, "evaluationAgencyAbilityList", "evaluationAgencyResourceList");
-        agency.setEvaluationAgencyAbilityList(this.evaluationAgencyAbilityList.stream().map(EvaluationAgencyAbility::new).collect(Collectors.toList()));
-        agency.setEvaluationAgencyResourceList(this.evaluationAgencyResourceList.stream().map(AgencyResourceCommand::toAgencyResource).collect(Collectors.toList()));
+        if(this.evaluationAgencyAbilityList.size() > 0 && this.evaluationAgencyAbilityList != null){
+            agency.setEvaluationAgencyAbilityList(this.evaluationAgencyAbilityList.stream().map(EvaluationAgencyAbility::new).collect(Collectors.toList()));
+
+        }
+        if(this.evaluationAgencyResourceList.size() > 0 && this.evaluationAgencyResourceList != null){
+            agency.setEvaluationAgencyAbilityList(this.evaluationAgencyAbilityList.stream().map(EvaluationAgencyAbility::new).collect(Collectors.toList()));
+            agency.setEvaluationAgencyResourceList(this.evaluationAgencyResourceList.stream().map(AgencyResourceCommand::toAgencyResource).collect(Collectors.toList()));
+        }
+
         agency.setIsDeleted(0);
         agency.setIsAuthentication(0);
         return agency;

site/src/main/java/com/mooctest/crowd/site/command/ApplyEnterpriseAuthCommand.java

@@ -1,5 +1,6 @@
 package com.mooctest.crowd.site.command;
 
+import com.alibaba.fastjson.JSONObject;
 import com.mooctest.crowd.domain.domainobject.EnterpriseAuthentication;
 import lombok.AllArgsConstructor;
 import lombok.Data;
@@ -8,6 +9,7 @@ import org.springframework.beans.BeanUtils;
 
 import javax.validation.constraints.NotNull;
 import java.sql.Timestamp;
+import java.util.ArrayList;
 
 /**
  * @author: Diors.Po
@@ -19,8 +21,10 @@ import java.sql.Timestamp;
 @NoArgsConstructor
 public class ApplyEnterpriseAuthCommand {
 
+//    private String isDaOrEa;
+
     @NotNull(message = "请选择认证研发机构或者评测机构")
-    private String isDaOrEa;
+    private ArrayList<Integer> roleList;
     @NotNull(message = "企业法人姓名不可为空")
     private String legalPersonName;
     @NotNull(message = "请上传营业执照")
@@ -41,8 +45,8 @@ public class ApplyEnterpriseAuthCommand {
     public EnterpriseAuthentication toEnterpriseAuth() {
         EnterpriseAuthentication enterpriseAuthentication = new EnterpriseAuthentication();
         BeanUtils.copyProperties(this, enterpriseAuthentication);
+        enterpriseAuthentication.setType(JSONObject.toJSONString(this.roleList));
         enterpriseAuthentication.setApplyTime(new Timestamp(System.currentTimeMillis()));
-        System.out.println(enterpriseAuthentication + "哈哈哈哈哈哈");
         return enterpriseAuthentication;
     }
 }

site/src/main/java/com/mooctest/crowd/site/command/ApplyPersonalAuthCommand.java

@@ -1,5 +1,6 @@
 package com.mooctest.crowd.site.command;
 
+import com.alibaba.fastjson.JSONObject;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.mooctest.crowd.domain.domainobject.PersonalAuthentication;
 import lombok.Data;
@@ -8,7 +9,7 @@ import org.springframework.beans.BeanUtils;
 import javax.validation.constraints.NotNull;
 import javax.validation.constraints.Pattern;
 import java.sql.Timestamp;
-import java.util.*;
+import java.util.List;
 
 /**
  * @author: Diors.Po
@@ -19,14 +20,14 @@ import java.util.*;
 public class ApplyPersonalAuthCommand {
 
     @NotNull(message = "请选择成为接包用户还是发包用户")
-    private  List<Integer> roleList;
+    private List<Integer> roleList;
 
-    private String  userId;
+    private String userId;
 
     @NotNull(message = "请填写真实姓名")
     private String realName;
 
-//    @NotNull(message = "请选择性别")
+    //    @NotNull(message = "请选择性别")
     private String sex;
 
     @JsonProperty(value = "IDCard")
@@ -52,6 +53,7 @@ public class ApplyPersonalAuthCommand {
     public PersonalAuthentication toPersonalAuth() {
         PersonalAuthentication personalAuthentication = new PersonalAuthentication();
         BeanUtils.copyProperties(this, personalAuthentication);
+        personalAuthentication.setType(JSONObject.toJSONString(this.roleList));
         personalAuthentication.setApplyTime(new Timestamp(System.currentTimeMillis()));
         return personalAuthentication;
     }

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

@@ -1,5 +1,6 @@
 package com.mooctest.crowd.site.data.vo;
 
+import com.alibaba.fastjson.JSONArray;
 import com.mooctest.crowd.domain.domainobject.EvaluationAgency;
 import com.mooctest.crowd.domain.domainobject.EvaluationAgencyAbility;
 import lombok.Data;
@@ -34,6 +35,7 @@ public class AgencyVO {
     private Timestamp createTime;
     private StatusVO authStatus;
     private Timestamp applyTime;
+    private List<String> type;
 
 
     public AgencyVO(EvaluationAgency agency){
@@ -47,6 +49,10 @@ public class AgencyVO {
             this.setEvaluationAgencyResourceList(agency.getEvaluationAgencyResourceList()
                     .stream().map(AgencyResourceVO::new).collect(Collectors.toList()));
         }
+
+        if(agency.getType() != null && agency.getType() !=  ""){
+            this.type = (List<String>) JSONArray.parse(agency.getType());
+        }
         this.authStatus = new StatusVO();
         this.authStatus.initAuthStatus(this.isAuthentication);
     }

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

@@ -1,10 +1,12 @@
 package com.mooctest.crowd.site.data.vo;
 
+import com.alibaba.fastjson.JSONArray;
 import com.mooctest.crowd.domain.domainobject.EnterpriseAuthentication;
 import lombok.Data;
 import org.springframework.beans.BeanUtils;
 
 import java.sql.Timestamp;
+import java.util.List;
 
 /**
  * @author: Diors.Po
@@ -15,28 +17,31 @@ import java.sql.Timestamp;
 public class EnterpriseAuthVO {
     private Long id;
     private Long userId;
-
+    private String enterpriseName;
+    private String IDCardNum;//身份证号码
     private String legalPersonName;
     private String businessLicensePhoto;
     private String unifiedSocialCreditCode;
-    private String bankAccount;
     private String sex;//2.0新加性别
-    private  String  IDcardPositivePhoto;//身份证正面照
-    private   String IDCardBackPhoto;//身份证反面照
+    private String idCardPositivePhoto;//身份证正面照
+    private String idCardBackPhoto;//身份证反面照
     private String address;
     private int isDeleted;
-    private Integer isAuthentication;
+    private int isAuthentication;
     private String explain;
     private Timestamp applyTime;
     private Timestamp checkTime;
+    private Timestamp IDCardDeadTime;//身份证过期时间
     private StatusVO authStatus;
-   private Timestamp  IDCardDeadTime;//身份证过期时间
-
+    private List<String> type;
 
 
-    public EnterpriseAuthVO(EnterpriseAuthentication authentication){
+    public EnterpriseAuthVO(EnterpriseAuthentication authentication) {
         BeanUtils.copyProperties(authentication, this);
         this.authStatus = new StatusVO();
         authStatus.initAuthStatus(this.isAuthentication);
+        if(authentication.getType() != null && authentication.getType() !=  ""){
+            this.type = (List<String>) JSONArray.parse(authentication.getType());
+        }
     }
 }

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

@@ -1,11 +1,13 @@
 package com.mooctest.crowd.site.data.vo;
 
+import com.alibaba.fastjson.JSONArray;
 import com.mooctest.crowd.domain.domainobject.PersonalAuthentication;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 import org.springframework.beans.BeanUtils;
 
 import java.sql.Timestamp;
+import java.util.List;
 
 /**
  * @author: Diors.Po
@@ -29,17 +31,19 @@ public class PersonalAuthVO {
     private StatusVO authStatus;
     private String IDCardPositivePhoto;//身份证正面照片
     private String IDCardBackPhoto;//身份证反面照片
-    private  String sex;
+    private String sex;
+    private List<String> type;
 
-    public PersonalAuthVO(PersonalAuthentication personalAuthentication){
+    public PersonalAuthVO(PersonalAuthentication personalAuthentication) {
         BeanUtils.copyProperties(personalAuthentication, this);
+
+        if(personalAuthentication.getType() != null && personalAuthentication.getType() !=  ""){
+            this.type = (List<String>) JSONArray.parse(personalAuthentication.getType());
+        }
         this.authStatus = new StatusVO();
         this.authStatus.initAuthStatus(this.isAuthentication);
-    }
-
-
-
 
+    }
 
 
 }

site/src/main/java/com/mooctest/crowd/site/mediator/ViewMediator.java

@@ -23,10 +23,11 @@ import java.util.List;
  */
 public interface ViewMediator {
 
-    void     saveEnterpriseRole(User user, ApplyEnterpriseAuthCommand applyEnterpriseAuthCommand);
-    void    saveUserRole(User user, ApplyPersonalAuthCommand command);
+    void saveEnterpriseRole(User user, ApplyEnterpriseAuthCommand applyEnterpriseAuthCommand);
 
-    List<UserVO> renderMoreUser(Pageable pageable,String keyword);
+    void saveUserRole(User user, ApplyPersonalAuthCommand command);
+
+    List<UserVO> renderMoreUser(Pageable pageable, String keyword);
 
 
     List<CrowdTaskVO> findMoreHotTasks();

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

@@ -123,26 +123,30 @@ public class WebMediatorImpl implements ViewMediator {
 
     @Override
     public void saveEnterpriseRole(User user, ApplyEnterpriseAuthCommand applyEnterpriseAuthCommand) {
-        UserPO userPO = userDao.save(Converter.convert(UserPO.class, user));
         //如果是研发机构那么能发包
-        if(applyEnterpriseAuthCommand.getIsDaOrEa().equals("研发机构")){
+        if(applyEnterpriseAuthCommand.getRoleList().contains(0) && applyEnterpriseAuthCommand.getRoleList().contains(1)){
             UserToRolePO u2r = new UserToRolePO();
-            u2r.setUserId(userPO.getId());
+            u2r.setUserId(user.getId());
             u2r.setRoleId(8L);
             userToRoleDao.save(u2r);
+            UserToRolePO u2rl = new UserToRolePO();
+            u2rl.setUserId(user.getId());
+            u2rl.setRoleId(2L);
+            userToRoleDao.save(u2rl);
 
         }
-        if(applyEnterpriseAuthCommand.getIsDaOrEa().equals("测评机构")){
+        else if(applyEnterpriseAuthCommand.getRoleList().contains(1)){
             UserToRolePO u2r = new UserToRolePO();
-            u2r.setUserId(userPO.getId());
+            u2r.setUserId(user.getId());
             u2r.setRoleId(2L);
             userToRoleDao.save(u2r);
         }
-
-
-
-
-
+        else if(applyEnterpriseAuthCommand.getRoleList().contains(0)){
+            UserToRolePO u2r = new UserToRolePO();
+            u2r.setUserId(user.getId());
+            u2r.setRoleId(8L);
+            userToRoleDao.save(u2r);
+        }
     }
 
     @Override
@@ -150,36 +154,32 @@ public class WebMediatorImpl implements ViewMediator {
         if (command.getRoleList().size() == 0 || command.getRoleList() == null) {
             throw new BaseException("请选择成为发包或者接包用户");
         }
-        //如果选择成为发包用户
         UserPO userPO = userDao.save(Converter.convert(UserPO.class, user));
-        if (command.getRoleList().contains(0)) {
+        //如果两个都选择那么权限都给
+        if (command.getRoleList().contains(1) && command.getRoleList().contains(0)) {
             UserToRolePO u2r = new UserToRolePO();
             u2r.setUserId(userPO.getId());
-            u2r.setRoleId(7L);
+            u2r.setRoleId(RoleType.PARTY_USER.getId());
             userToRoleDao.save(u2r);
+            UserToRolePO u2rl = new UserToRolePO();
+            u2rl.setUserId(userPO.getId());
+            u2rl.setRoleId(RoleType.EVALUATION_USER.getId());
+            userToRoleDao.save(u2rl);
         }
-        //如果选择成为接包用户
-        if (command.getRoleList().contains(1)) {
+        //如果选择成为发包用户
+        else if (command.getRoleList().contains(0)) {
             UserToRolePO u2r = new UserToRolePO();
             u2r.setUserId(userPO.getId());
-            u2r.setRoleId(6L);
+            u2r.setRoleId(RoleType.PARTY_USER.getId());
             userToRoleDao.save(u2r);
-
-            //如果两个都选择那么权限都给
-        } else if (command.getRoleList().contains(1) && command.getRoleList().contains(0)) {
+        }
+        //如果选择成为接包用户
+        else if (command.getRoleList().contains(1)) {
             UserToRolePO u2r = new UserToRolePO();
             u2r.setUserId(userPO.getId());
-            u2r.setRoleId(7L);
+            u2r.setRoleId(RoleType.EVALUATION_USER.getId());
             userToRoleDao.save(u2r);
-            UserToRolePO u2rl = new UserToRolePO();
-            u2r.setUserId(userPO.getId());
-            u2r.setRoleId(6L);
-            userToRoleDao.save(u2rl);
-
         }
-
-
-
     }
 
     @Override