20210618跳绳比赛修改参赛人员信息异常

mt/src/main/java/com/ccsens/mt/service/ImportService.java

@@ -7,9 +7,12 @@ import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.StrUtil;
 import com.ccsens.mt.bean.po.CompeteCompany;
 import com.ccsens.mt.bean.po.CompetePlayer;
+import com.ccsens.mt.bean.po.CompeteProject;
+import com.ccsens.mt.bean.po.CompeteProjectExample;
 import com.ccsens.mt.bean.vo.CompeteExcelVo;
 import com.ccsens.mt.persist.dao.CompeteCompanyDao;
 import com.ccsens.mt.persist.dao.CompetePlayerDao;
+import com.ccsens.mt.persist.dao.CompeteProjectDao;
 import com.ccsens.util.ExcelUtil;
 import com.ccsens.util.StringUtil;
 import lombok.extern.slf4j.Slf4j;
@@ -40,6 +43,8 @@ public class ImportService implements IImportService{
     private Snowflake snowflake;
     @Resource
     private CompetePlayerDao competePlayerDao;
+    @Resource
+    private CompeteProjectDao competeProjectDao;
 
 
     @Override
@@ -64,6 +69,11 @@ public class ImportService implements IImportService{
                         type = 6;
                     }
                 }
+                //查找决赛的项目
+                CompeteProjectExample projectExample = new CompeteProjectExample();
+                projectExample.createCriteria().andTypeEqualTo((byte) 7);
+                List<CompeteProject> projectList = competeProjectDao.selectByExample(projectExample);
+                Map<String,Object> projectMap = new HashMap<>();
                 //读取sheet内的信息
                 readSheet(sheet,type,errorPlayers);
             }
@@ -74,6 +84,7 @@ public class ImportService implements IImportService{
     private void readSheet(XSSFSheet sheet, int type, List<CompeteExcelVo.ErrorPlayer> errorPlayers) {
         Map<String,CompeteCompany> companyMap = new HashMap<>();
         Map<String,CompetePlayer> playerMap = new HashMap<>();
+
         for (int i = 1; i < sheet.getLastRowNum(); i++) {
             //参赛单位
             String companyCell = StringUtil.replaceStrSpace(ExcelUtil.getCellValue(sheet.getRow(i).getCell(2)));

mt/src/main/java/com/ccsens/mt/service/ProvinceService.java

@@ -249,6 +249,8 @@ public class ProvinceService implements IProvinceService {
             if(ageByIdCard < competeGroup.getMinAge() || ageByIdCard > competeGroup.getMaxAge()){
                 throw new BaseException(CodeEnum.MT_NOT_GROUP);
             }
+            //TODO 修改组别信息
+            if(ObjectUtil.isNotNull(competeGroup)){player.setCompeteGroupId(competeGroup.getId());}
             //字段不为空则修改
             if(StrUtil.isNotEmpty(param.getPlayerName())){player.setName(param.getPlayerName());}