fix conflix

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

@@ -8,6 +8,7 @@ import org.springframework.beans.BeanUtils;
 import javax.validation.constraints.NotNull;
 import javax.validation.constraints.Pattern;
 import java.sql.Timestamp;
+import java.util.*;
 
 /**
  * @author: Diors.Po
@@ -17,6 +18,8 @@ import java.sql.Timestamp;
 @Data
 public class ApplyPersonalAuthCommand {
 
+    private  List<Integer> roleList;
+
     private String  userId;
 
     @NotNull(message = "请填写真实姓名")

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

@@ -28,7 +28,7 @@ import java.util.List;
  */
 @Slf4j
 @RestController
-public class CrowdProjectController {
+public class CrowdProjectController{
 
     @Autowired
     private CrowdProjectService projectService;
@@ -39,14 +39,17 @@ public class CrowdProjectController {
      * @param result
      * @return
      */
-    @RequestMapping(value = "/api/project", method = RequestMethod.POST)
-    public ProjectDetailsDTO createProject(@Validated @RequestBody CrowdTestProjectCommand crowdTestProjectCommand, BindingResult result){
-        if (result.hasErrors())
+    @RequestMapping(value = "/api/project/", method = RequestMethod.POST)
+    public ProjectDetailsDTO createProject(@Validated @RequestBody CrowdTestProjectCommand crowdTestProjectCommand, BindingResult result,HttpSession session){
+        long  userId=Long.parseLong((String) session.getAttribute("userId"));
+
+        if (result.hasErrors()) {
             throw new BaseException(result.getFieldErrors().toString());
+        }
         else if (!crowdTestProjectCommand.isLegal())
             throw new BaseException("信息不合法，项目可见性必须选择指定的市");
 //            throw new BaseException("信息不合法，项目可见性存在问题");
-        return projectService.createCrowdProject(crowdTestProjectCommand);
+        return projectService.createCrowdProject(crowdTestProjectCommand,userId);
     }
 
     /**

site/src/main/java/com/mooctest/crowd/site/data/enums/RoleType.java

@@ -13,12 +13,12 @@ import lombok.NoArgsConstructor;
 public enum RoleType {
 
     GENERAL_USER(1L, "generalUser"),        // 注册后的普通用户
-    AGENCY(2L, "evaluationAgency"),         // 注册为测评机构
+    AGENCY(2L, "evaluationAgency"),         // 注册为测评机构接包
     REGIONAL_MANAGER(3L, "RegionalManager"),
     SYSTEM_ADMIN(4L, "RegionalManager"),
     ENTERPRISE_USER(5L, "enterpriseUser"),
-    EVALUATION_USER(6L, "evaluationUser"),  // 注册为测评用户
-    PARTY_USER(7L, "partyUser"),            // 注册为发包用户
+    EVALUATION_USER(6L, "evaluationUser"),  // 注册为测评用户接包
+    PARTY_USER(7L, "partyUser"),            // 注册为发包用户发包
     PARTY_AGENCY(8L, "partyAgency");        // 注册为发包机构
 
     private Long id;

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

@@ -41,10 +41,9 @@ public class UserVO implements Serializable {
     private String address;
 
 
-
     public UserVO(User user) {
         BeanUtils.copyProperties(user, this);
-        this.address=this.province+this.city;
+        this.address = this.province + this.city;
         this.password = "********";
         if (user.getEvaluationAgency() != null) {
             this.authType = "agency";

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

@@ -5,6 +5,7 @@ import com.mooctest.crowd.domain.domainobject.User;
 import com.mooctest.crowd.domain.exception.AccountNotExistException;
 import com.mooctest.crowd.domain.exception.BadRequestException;
 import com.mooctest.crowd.domain.exception.PasswordErrorException;
+import com.mooctest.crowd.site.command.ApplyPersonalAuthCommand;
 import com.mooctest.crowd.site.command.LoginCommand;
 import com.mooctest.crowd.site.command.RegisterCommand;
 import com.mooctest.crowd.site.data.dto.*;
@@ -20,6 +21,9 @@ import java.util.List;
  */
 public interface ViewMediator {
 
+
+    void    saveUserRole(User user, ApplyPersonalAuthCommand command);
+
     List<UserVO> renderMoreUser(Pageable pageable);
 
 

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

@@ -10,6 +10,7 @@ import com.mooctest.crowd.domain.repository.CrowdTestProjectRepo;
 import com.mooctest.crowd.domain.repository.EvaluationAgencyRepo;
 import com.mooctest.crowd.domain.repository.UserRepo;
 import com.mooctest.crowd.domain.util.Converter;
+import com.mooctest.crowd.site.command.ApplyPersonalAuthCommand;
 import com.mooctest.crowd.site.command.LoginCommand;
 import com.mooctest.crowd.site.command.RegisterCommand;
 import com.mooctest.crowd.site.data.ProjectOperationControl;
@@ -113,6 +114,44 @@ public class WebMediatorImpl implements ViewMediator {
 
     @Value("${agency}")
     private String agencyId;
+    @Autowired
+    private UserToRoleDao userToRoleDao;
+
+    @Override
+    public void saveUserRole(User user, ApplyPersonalAuthCommand command) {
+        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)) {
+            UserToRolePO u2r = new UserToRolePO();
+            u2r.setUserId(userPO.getId());
+            u2r.setRoleId(7L);
+            userToRoleDao.save(u2r);
+        }
+        //如果选择成为接包用户
+        if (command.getRoleList().contains(1)) {
+            UserToRolePO u2r = new UserToRolePO();
+            u2r.setUserId(userPO.getId());
+            u2r.setRoleId(6L);
+            userToRoleDao.save(u2r);
+
+            //如果两个都选择那么权限都给
+        } else if (command.getRoleList().contains(1) && command.getRoleList().contains(0)) {
+            UserToRolePO u2r = new UserToRolePO();
+            u2r.setUserId(userPO.getId());
+            u2r.setRoleId(7L);
+            userToRoleDao.save(u2r);
+            UserToRolePO u2rl = new UserToRolePO();
+            u2r.setUserId(userPO.getId());
+            u2r.setRoleId(6L);
+            userToRoleDao.save(u2rl);
+
+        }
+
+
+    }
 
     @Override
     public List<UserVO> renderMoreUser(Pageable pageable) {
@@ -348,11 +387,11 @@ public class WebMediatorImpl implements ViewMediator {
         List<UserVO> userRanks = userTaskCountDao.findByType(RoleType.EVALUATION_USER.getId())
                 .stream().sorted(Comparator.comparing(UserTaskCountPO::getCount)).limit(top).collect(Collectors.toList())
                 .stream().map(userTaskCountPO -> {
-            User user = userRepo.getByIDJustInfo(userTaskCountPO.getUserId());
-            UserVO userVO = new UserVO(user);
-            userVO.setTaskCount(userTaskCountPO.getCount());
-            return userVO;
-        }).collect(Collectors.toList());
+                    User user = userRepo.getByIDJustInfo(userTaskCountPO.getUserId());
+                    UserVO userVO = new UserVO(user);
+                    userVO.setTaskCount(userTaskCountPO.getCount());
+                    return userVO;
+                }).collect(Collectors.toList());
 
 //        List<UserVO> userRanks = new ArrayList<>();
 //        if (userRank.size() > top) {
@@ -736,7 +775,7 @@ public class WebMediatorImpl implements ViewMediator {
     }
 
     @Override
-    public ReportDetailsDTO renderProjectReportDetails(String projectCode, String reportCode, Long userId){
+    public ReportDetailsDTO renderProjectReportDetails(String projectCode, String reportCode, Long userId) {
         CrowdTestProject project = projectRepo.getByProjectCode(projectCode);
         CrowdTestReport report = project.getCrowdTestReportForProject();
         if (report == null)
@@ -745,7 +784,7 @@ public class WebMediatorImpl implements ViewMediator {
         /*
          如果该项目是已经完成的那么报告是不能修改的这边我在Vo上面加了一个属性Updated
          */
-        if (project.getStatus() == CrowdTestProjectStatus.HAS_FINISHED){
+        if (project.getStatus() == CrowdTestProjectStatus.HAS_FINISHED) {
             report.setUpdated(false);
         }
         reportDetailsDTO.setCrowdReportVO(new CrowdReportVO(report));
@@ -1023,6 +1062,7 @@ public class WebMediatorImpl implements ViewMediator {
         if (userVO.getUnit() == null || userVO.getUnit().length() <= 0) {
             throw new HttpBadRequestException("请输入企业简称");
         }
+        userPO.get().setPhotoUrl(userVO.getPhotoUrl());
         userPO.get().setUnit(userVO.getUnit());
         userPO.get().setGender(userVO.getGender());
         userPO.get().setBirthday(userVO.getBirthday());
@@ -1056,9 +1096,9 @@ public class WebMediatorImpl implements ViewMediator {
     @Override
     public QualificationDTO addQualification(long userId, QualificationVO qualificationVO) {
         QualificationPO qualificationPO = new QualificationPO();
-        List<QualificationPO>  qualificationPOList=qualificationDao.findByUserIdAndIsDeleted(userId, DeletedStatus.isNotDeleted);
-        for(int i=0;i<qualificationPOList.size();i++){
-            if(qualificationVO.getName().equals(qualificationPOList.get(i).getName())){
+        List<QualificationPO> qualificationPOList = qualificationDao.findByUserIdAndIsDeleted(userId, DeletedStatus.isNotDeleted);
+        for (int i = 0; i < qualificationPOList.size(); i++) {
+            if (qualificationVO.getName().equals(qualificationPOList.get(i).getName())) {
                 throw new HttpBadRequestException("资质已存在");
             }
         }
@@ -1100,16 +1140,16 @@ public class WebMediatorImpl implements ViewMediator {
             BankCardVO bankCardVO = new BankCardVO();
             bankCardVO.setId(bankCardPO.getId());
             bankCardVO.setUser(bankCardPO.getUser());
-            int length=bankCardPO.getNumber().length();
+            int length = bankCardPO.getNumber().length();
             int afterLength = 4;
             String replaceSymbol = "*";
             StringBuffer sb = new StringBuffer();
             for (int i = 0; i < length; i++) {
                 if (i >= (length - afterLength)) {
-                            sb.append(bankCardPO.getNumber().charAt(i));
+                    sb.append(bankCardPO.getNumber().charAt(i));
                 } else {
-                            sb.append(replaceSymbol);
-                        }
+                    sb.append(replaceSymbol);
+                }
                 bankCardVO.setNumber(sb.toString());
             }
             Optional<BankLogoPO> bankLogo = bankLogoDao.findByCode(bankCardPO.getCode());
@@ -1135,13 +1175,13 @@ public class WebMediatorImpl implements ViewMediator {
             throw new HttpBadRequestException("请输入正确的卡号");
         }
         String bank = String.valueOf(json.get("bank"));
-        Optional<BankLogoPO> bankLogoPO=bankLogoDao.findByName(bankCardVO.getName());
-        if(!bank.equals(bankLogoPO.get().getName())){
+        Optional<BankLogoPO> bankLogoPO = bankLogoDao.findByName(bankCardVO.getName());
+        if (!bank.equals(bankLogoPO.get().getName())) {
             throw new HttpBadRequestException("请输入与选定银行一致的账号");
         }
-        List<BankCardPO> bankCardPOList=bankCardDao.findByUserIdAndIsDeleted(userId, DeletedStatus.isNotDeleted);
-        for(int i=0;i<bankCardPOList.size();i++){
-            if(bankCardVO.getNumber().equals(bankCardPOList.get(i).getNumber())){
+        List<BankCardPO> bankCardPOList = bankCardDao.findByUserIdAndIsDeleted(userId, DeletedStatus.isNotDeleted);
+        for (int i = 0; i < bankCardPOList.size(); i++) {
+            if (bankCardVO.getNumber().equals(bankCardPOList.get(i).getNumber())) {
                 throw new HttpBadRequestException("银行卡已存在");
             }
         }
@@ -1210,13 +1250,13 @@ public class WebMediatorImpl implements ViewMediator {
         resourceVO.setUnitWork(resourcePO.get().getUnitWork());
         resourceVO.setStandard(resourcePO.get().getStandard());
         resourceVO.setUnit(resourcePO.get().getUnit());
-        if(resourcePO.get().getState()==0){
+        if (resourcePO.get().getState() == 0) {
             resourceVO.setState(ResourceStatus.R_FREE);
-        }else if(resourcePO.get().getState()==1){
+        } else if (resourcePO.get().getState() == 1) {
             resourceVO.setState(ResourceStatus.R_OCCUPY);
-        }else if(resourcePO.get().getState()==2){
+        } else if (resourcePO.get().getState() == 2) {
             resourceVO.setState(ResourceStatus.R_USABLE);
-        }else {
+        } else {
             resourceVO.setState(ResourceStatus.R_FAULT);
         }
         resourceVO.setStartTime(resourcePO.get().getStartTime());
@@ -1264,7 +1304,7 @@ public class WebMediatorImpl implements ViewMediator {
         qualificationVO.setIsPublic(qualificationPO.get().getIsPublic());
         qualificationDTO.setQualificationVO(qualificationVO);
         return qualificationDTO;
-}
+    }
 
     @Override
     public BankCardDTO getBankType() {

site/src/main/java/com/mooctest/crowd/site/service/CrowdProjectService.java

@@ -28,7 +28,7 @@ public interface CrowdProjectService {
 
     ProjectDetailsDTO getProjectDetails(String projectCode, Long userId);
 
-    ProjectDetailsDTO createCrowdProject(CrowdTestProjectCommand command);
+    ProjectDetailsDTO createCrowdProject(CrowdTestProjectCommand command,long userId);
 
     ProjectDetailsDTO updateProject(String projectCode, CrowdTestProjectCommand crowdTestProjectCommand);
 

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

@@ -1,16 +1,15 @@
 package com.mooctest.crowd.site.service.impl;
 
 import com.google.common.collect.Lists;
-import com.mooctest.crowd.domain.dao.ApplicationTypeDao;
-import com.mooctest.crowd.domain.dao.FieldDao;
-import com.mooctest.crowd.domain.dao.TestTypeDao;
-import com.mooctest.crowd.domain.dao.UserTaskCountDao;
+import com.mooctest.crowd.domain.dao.*;
 import com.mooctest.crowd.domain.domainobject.*;
 import com.mooctest.crowd.domain.exception.BadRequestException;
 import com.mooctest.crowd.domain.exception.BaseException;
 import com.mooctest.crowd.domain.exception.Excel2ProjectException;
 import com.mooctest.crowd.domain.factory.CrowdTestProjectFactory;
+import com.mooctest.crowd.domain.model.RolePO;
 import com.mooctest.crowd.domain.model.UserTaskCountPO;
+import com.mooctest.crowd.domain.model.UserToRolePO;
 import com.mooctest.crowd.domain.repository.CrowdTestProjectRepo;
 import com.mooctest.crowd.domain.repository.UserRepo;
 import com.mooctest.crowd.domain.util.Converter;
@@ -55,6 +54,11 @@ import java.util.stream.Collectors;
 @Slf4j
 @Service
 public class CrowdProjectServiceImpl implements CrowdProjectService {
+    @Autowired
+    private RoleDao roleDao;
+    @Autowired
+
+    private UserToRoleDao userToRoleDao;
 
     @Autowired
     private ViewMediator viewMediator;
@@ -76,7 +80,7 @@ public class CrowdProjectServiceImpl implements CrowdProjectService {
 
     @Autowired
     private FieldDao fieldDao;
-    
+
     @Autowired
     private UserTaskCountDao userTaskCountDao;
 
@@ -85,19 +89,18 @@ public class CrowdProjectServiceImpl implements CrowdProjectService {
 
     @Override
     public List<CrowdTestProjectVO> findAllMoreHotProjects() {
-        List<CrowdTestProjectVO> list=viewMediator.findMoreHotProjects();//根据创建时间已经倒叙排序好
+        List<CrowdTestProjectVO> list = viewMediator.findMoreHotProjects();//根据创建时间已经倒叙排序好
         //根据参与人数倒叙排序
-        List<CrowdTestProjectVO>  moreHotProjects=list.stream().sorted(Comparator.comparing(CrowdTestProjectVO::getJoinCount).reversed()).collect(Collectors.toList());
-        return   moreHotProjects;
+        List<CrowdTestProjectVO> moreHotProjects = list.stream().sorted(Comparator.comparing(CrowdTestProjectVO::getJoinCount).reversed()).collect(Collectors.toList());
+        return moreHotProjects;
     }
 
     @Override
     public List<CrowdTestProjectVO> findByNameLike(String name) {
-        if(name==null||name.trim().equals("")){
-            return  viewMediator.crowdTestProjects().stream().sorted(Comparator.comparing(CrowdTestProjectVO::getCreateTime).reversed()).collect(Collectors.toList());
+        if (name == null || name.trim().equals("")) {
+            return viewMediator.crowdTestProjects().stream().sorted(Comparator.comparing(CrowdTestProjectVO::getCreateTime).reversed()).collect(Collectors.toList());
         }
-       return  viewMediator.findByNameLike(name).stream().sorted(Comparator.comparing(CrowdTestProjectVO::getCreateTime).reversed()).collect(Collectors.toList());
-
+        return viewMediator.findByNameLike(name).stream().sorted(Comparator.comparing(CrowdTestProjectVO::getCreateTime).reversed()).collect(Collectors.toList());
 
 
     }
@@ -111,12 +114,10 @@ public class CrowdProjectServiceImpl implements CrowdProjectService {
     @Override
     public List<CrowdTestProjectVO> findAll(Pageable pageable) {
 
-        return  viewMediator.crowdTestProjects();
+        return viewMediator.crowdTestProjects();
     }
 
 
-
-
     @Override
     public List<CrowdTestProjectVO> findAll() {
         return viewMediator.crowdTestProjects();
@@ -131,20 +132,52 @@ public class CrowdProjectServiceImpl implements CrowdProjectService {
     }
 
     @Override
-    public ProjectDetailsDTO createCrowdProject(CrowdTestProjectCommand command) {
-        CrowdTestProject project = command.toCrowdProject();
-        project.setStatus(CrowdTestProjectStatus.HAS_RELEASED);
-        log.info("\n" + project.toString() + "\n");
-        String projectCode = GenerateFlowCodeUtil.generateFlowCode("PROJ");
-        project.setCode(projectCode);
-        if(project.getCreateTime() == null){
-            project.setCreateTime(new Timestamp(System.currentTimeMillis()));
+    public ProjectDetailsDTO createCrowdProject(CrowdTestProjectCommand command, long userId) {
+        boolean canCreateProject = false;//当前用户是否能接包
+        // 获取用户所有角色
+        List<UserToRolePO> usertoRole = userToRoleDao.findByUserId(userId);
+        //用户所有角色PO
+        List<RolePO> rolePOS = new ArrayList<>();//用户所有角色列表
+        //用户所有角色id
+        long rolIdArray[] = new long[usertoRole.size()];
+        for (int i = 0; i < rolIdArray.length; i++) {
+            rolIdArray[i] = usertoRole.get(i).getRoleId();
+            Optional<RolePO> role = roleDao.findById(rolIdArray[i]);
+            rolePOS.add(role.get());
         }
-        ProjectDetailsDTO projectDetailsDTO = new ProjectDetailsDTO();
-        projectRepo.saveCrowdTestProject(project);
-        projectDetailsDTO.setProjectDetails(new CrowdProjectVO(project));
-        themeSchedulerService.createNewThemeScheduler(project);
-        return projectDetailsDTO;
+        //获取用户角色列表所有的角色name;
+        List<String> roleNames = new ArrayList<>();
+        for (int i = 0; i < rolePOS.size(); i++) {
+            roleNames.add(rolePOS.get(i).getName());
+        }
+
+        for (int i = 0; i < roleNames.size(); i++) {
+            if (roleNames.get(i).equals("RegionalManager") || roleNames.get(i).equals("SystemAdministrator")
+                    || roleNames.get(i).equals("enterpriseUser") || roleNames.get(i).equals("partyUser") || roleNames.get(i).equals("partyAgency")) {
+                canCreateProject = true;
+            } else {
+                canCreateProject = false;
+
+            }
+        }
+
+
+        if (canCreateProject) {
+            CrowdTestProject project = command.toCrowdProject();
+            project.setStatus(CrowdTestProjectStatus.HAS_RELEASED);
+            log.info("\n" + project.toString() + "\n");
+            String projectCode = GenerateFlowCodeUtil.generateFlowCode("PROJ");
+            project.setCode(projectCode);
+            if (project.getCreateTime() == null) {
+                project.setCreateTime(new Timestamp(System.currentTimeMillis()));
+            }
+            ProjectDetailsDTO projectDetailsDTO = new ProjectDetailsDTO();
+            projectRepo.saveCrowdTestProject(project);
+            projectDetailsDTO.setProjectDetails(new CrowdProjectVO(project));
+            themeSchedulerService.createNewThemeScheduler(project);
+            return projectDetailsDTO;
+        }
+        return null;
     }
 
     @Override
@@ -155,7 +188,7 @@ public class CrowdProjectServiceImpl implements CrowdProjectService {
         if (!project.getUserId().equals(crowdTestProjectCommand.getUserId()))
             throw new BaseException("UserId不一致, newUserId: " + crowdTestProjectCommand.getUserId() + ", oldUserId: " + project.getUserId());
         //todo 后面需要加入是否有权限进行更新
-        if(project.getCreateTime() == null){
+        if (project.getCreateTime() == null) {
             project.setCreateTime(new Timestamp(System.currentTimeMillis()));
         }
         projectRepo.saveCrowdTestProject(operationMediator.updateProject(project, crowdTestProjectCommand));
@@ -327,12 +360,12 @@ public class CrowdProjectServiceImpl implements CrowdProjectService {
                 // 对用户判断认证类型 测评机构为1 测试人员为2
 
                 Optional<UserTaskCountPO> userTaskCountPOOptional = userTaskCountDao.findByUserId(user.getId());
-                if(!userTaskCountPOOptional.isPresent()){
+                if (!userTaskCountPOOptional.isPresent()) {
                     UserTaskCount userTaskCount = new UserTaskCount(user.getId(), 1L, RoleType.EVALUATION_USER.getId());
                     userTaskCountDao.save(Converter.convert(UserTaskCountPO.class, userTaskCount));
-                }else{
+                } else {
                     UserTaskCountPO userTaskCountPO = userTaskCountPOOptional.get();
-                    userTaskCountPO.setCount(userTaskCountPO.getCount()+1);
+                    userTaskCountPO.setCount(userTaskCountPO.getCount() + 1);
                     userTaskCountDao.save(userTaskCountPO);
                 }
                 return null;
@@ -446,7 +479,7 @@ public class CrowdProjectServiceImpl implements CrowdProjectService {
                         project.setName(cell.getStringCellValue().trim());
                         break;
                     case 1:
-                        if(fieldDao.findAll().stream().noneMatch(fieldPO -> fieldPO.getName().equals(cell.getStringCellValue().trim()))){
+                        if (fieldDao.findAll().stream().noneMatch(fieldPO -> fieldPO.getName().equals(cell.getStringCellValue().trim()))) {
                             logList.add("错误 - 行: " + (i + 1) + "; 列: " + (j + 1) + "; 原因: " + "领域类型数据不合法：" + cell.getStringCellValue());
                             break;
                         }
@@ -454,7 +487,7 @@ public class CrowdProjectServiceImpl implements CrowdProjectService {
 //                        project.setFieldType(fieldDao.findByName(cell.getStringCellValue().trim()).get().getCode());
                         break;
                     case 2:
-                        if(applicationTypeDao.findAll().stream().noneMatch(applicationTypePO -> applicationTypePO.getName().equals(cell.getStringCellValue().trim()))){
+                        if (applicationTypeDao.findAll().stream().noneMatch(applicationTypePO -> applicationTypePO.getName().equals(cell.getStringCellValue().trim()))) {
                             logList.add("错误 - 行: " + (i + 1) + "; 列: " + (j + 1) + "; 原因: " + "应用类型数据不合法：" + cell.getStringCellValue());
                             break;
                         }
@@ -462,7 +495,7 @@ public class CrowdProjectServiceImpl implements CrowdProjectService {
 //                        project.setApplicationType(applicationTypeDao.findByName(cell.getStringCellValue().trim()).get().getCode());
                         break;
                     case 3:
-                        if(testTypeDao.findAll().stream().noneMatch(testTypePO -> testTypePO.getName().equals(cell.getStringCellValue().trim()))){
+                        if (testTypeDao.findAll().stream().noneMatch(testTypePO -> testTypePO.getName().equals(cell.getStringCellValue().trim()))) {
                             logList.add("错误 - 行: " + (i + 1) + "; 列: " + (j + 1) + "; 原因: " + "测试类型数据不合法：" + cell.getStringCellValue());
                             break;
                         }
@@ -475,7 +508,7 @@ public class CrowdProjectServiceImpl implements CrowdProjectService {
                         project.setLinkMan(cell.getStringCellValue().trim());
                         break;
                     case 6:
-                        if(!cell.getStringCellValue().trim().contains("*")){
+                        if (!cell.getStringCellValue().trim().contains("*")) {
                             if (!isRightPhone(cell.getStringCellValue().trim())) {
                                 logList.add("错误 - 行: " + (i + 1) + "; 列: " + (j + 1) + "; 原因: " + "不合法的手机号码：" + cell.getStringCellValue());
                                 break;