From eafc24f0d0bcef62f149c308b843e609f6f983f1 Mon Sep 17 00:00:00 2001 From: ma <1062634917@qq.com> Date: Wed, 16 Jun 2021 15:41:52 +0800 Subject: [PATCH 1/5] =?UTF-8?q?mt=E5=AF=BC=E5=85=A5=E5=86=B3=E8=B5=9Bexcel?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mt/persist/dao/CompeteCompanyDao.java | 11 ++-- .../mt/persist/dao/CompetePlayerDao.java | 8 +++ .../com/ccsens/mt/service/ImportService.java | 53 +++++++++++++++++-- mt/src/main/resources/druid-dev.yml | 4 +- .../mapper_dao/CompeteCompanyDao.xml | 22 +++++++- .../resources/mapper_dao/CompetePlayerDao.xml | 17 ++++++ 6 files changed, 103 insertions(+), 12 deletions(-) diff --git a/mt/src/main/java/com/ccsens/mt/persist/dao/CompeteCompanyDao.java b/mt/src/main/java/com/ccsens/mt/persist/dao/CompeteCompanyDao.java index 7c2f71df..ede04f31 100644 --- a/mt/src/main/java/com/ccsens/mt/persist/dao/CompeteCompanyDao.java +++ b/mt/src/main/java/com/ccsens/mt/persist/dao/CompeteCompanyDao.java @@ -164,10 +164,11 @@ public interface CompeteCompanyDao extends CompeteCompanyMapper { /** * 根据单位名和类型查找参赛单位信息，筛选出有用的一条 - * @param companyCell - * @param playerName - * @param projectCell - * @return + * @param companyCell 单位名称 + * @param playerName 参赛人员名称 + * @param projectCell 项目名称 + * @param type 比赛类型 + * @return 报名单位信息 */ - List getCompanyByNameAndType(String companyCell, String playerName, String projectCell,int type); + List getCompanyByNameAndType(@Param("companyName") String companyCell,@Param("playerName") String playerName,@Param("projectName") String projectCell,@Param("type") int type); } diff --git a/mt/src/main/java/com/ccsens/mt/persist/dao/CompetePlayerDao.java b/mt/src/main/java/com/ccsens/mt/persist/dao/CompetePlayerDao.java index 3805c69c..2c03f92b 100644 --- a/mt/src/main/java/com/ccsens/mt/persist/dao/CompetePlayerDao.java +++ b/mt/src/main/java/com/ccsens/mt/persist/dao/CompetePlayerDao.java @@ -106,4 +106,12 @@ public interface CompetePlayerDao extends CompetePlayerMapper { * @return */ List getJoinRuleTeamNumByType(@Param("type")byte type); + + /** + * 根据团队id和名字查找选手信息 + * @param playerCell 选手姓名 + * @param id 团队id + * @return 选手信息 + */ + List getPlayerByNameAndCompany(@Param("name") String playerCell,@Param("id") Long id); } diff --git a/mt/src/main/java/com/ccsens/mt/service/ImportService.java b/mt/src/main/java/com/ccsens/mt/service/ImportService.java index 26335a6a..2349ac4b 100644 --- a/mt/src/main/java/com/ccsens/mt/service/ImportService.java +++ b/mt/src/main/java/com/ccsens/mt/service/ImportService.java @@ -1,10 +1,15 @@ package com.ccsens.mt.service; +import cn.hutool.core.bean.BeanUtil; +import cn.hutool.core.collection.CollectionUtil; +import cn.hutool.core.lang.Snowflake; 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.vo.CompeteExcelVo; import com.ccsens.mt.persist.dao.CompeteCompanyDao; +import com.ccsens.mt.persist.dao.CompetePlayerDao; import com.ccsens.util.ExcelUtil; import com.ccsens.util.StringUtil; import lombok.extern.slf4j.Slf4j; @@ -18,7 +23,9 @@ import javax.annotation.Resource; import java.io.FileInputStream; import java.io.InputStream; import java.util.ArrayList; +import java.util.HashMap; import java.util.List; +import java.util.Map; /** * @author 逗 @@ -29,6 +36,10 @@ import java.util.List; public class ImportService implements IImportService{ @Resource private CompeteCompanyDao competeCompanyDao; + @Resource + private Snowflake snowflake; + @Resource + private CompetePlayerDao competePlayerDao; @Override @@ -61,21 +72,55 @@ public class ImportService implements IImportService{ } private void readSheet(XSSFSheet sheet, int type, List errorPlayers) { + Map companyMap = new HashMap<>(); + Map playerMap = new HashMap<>(); for (int i = 1; i < sheet.getLastRowNum(); i++) { //参赛单位 - String companyCell = StringUtil.replaceStrSpace(ExcelUtil.getCellValue(sheet.getRow(i).getCell(0))); + String companyCell = StringUtil.replaceStrSpace(ExcelUtil.getCellValue(sheet.getRow(i).getCell(2))); //参赛项目 String projectCell = StringUtil.replaceStrSpace(ExcelUtil.getCellValue(sheet.getRow(i).getCell(0))); //组别 - String groupCell = StringUtil.replaceStrSpace(ExcelUtil.getCellValue(sheet.getRow(i).getCell(0))); + String groupCell = StringUtil.replaceStrSpace(ExcelUtil.getCellValue(sheet.getRow(i).getCell(1))); //选手姓名 - String playerCell = StringUtil.replaceStrSpace(ExcelUtil.getCellValue(sheet.getRow(i).getCell(0))); + String playerCell = StringUtil.replaceStrSpace(ExcelUtil.getCellValue(sheet.getRow(i).getCell(3))); String[] playerNames = new String[]{playerCell}; if(StrUtil.isNotBlank(playerCell)){ playerNames = playerCell.split("、"); } //查找参赛单位 - List company = competeCompanyDao.getCompanyByNameAndType(companyCell,playerNames[0],projectCell,type); + if (!companyMap.containsKey(companyCell)){ + List company = competeCompanyDao.getCompanyByNameAndType(companyCell,playerNames[0],projectCell,type); + if (CollectionUtil.isNotEmpty(company)){ + //查看是该单位是否已经进决赛 + List companyByNameAndType = competeCompanyDao.getCompanyByNameAndType(companyCell, playerNames[0], projectCell, 7); + if (CollectionUtil.isEmpty(companyByNameAndType)){ + //复制参赛单位到决赛 + CompeteCompany newCompany = new CompeteCompany(); + BeanUtil.copyProperties(company.get(0),newCompany); + newCompany.setId(snowflake.nextId()); + newCompany.setType((byte)7); + newCompany.setCompeteTimeId(7L); + competeCompanyDao.insertSelective(newCompany); + companyMap.put(companyCell,newCompany); + } + }else{ + CompeteExcelVo.ErrorPlayer errorPlayer = new CompeteExcelVo.ErrorPlayer(); + errorPlayer.setSheetName(companyCell); + errorPlayer.setRowNum(i); + errorPlayer.setRemark("未查找原参赛单位"); + errorPlayers.add(errorPlayer); + } + } + + //添加选手信息 + List playerList = competePlayerDao.getPlayerByNameAndCompany(playerCell,companyMap.get(companyCell).getId()); + if (CollectionUtil.isNotEmpty(playerList)){ + CompetePlayer newPlayer = new CompetePlayer(); + BeanUtil.copyProperties(playerList.get(0),newPlayer); + newPlayer.setId(snowflake.nextId()); + newPlayer.setCompanyId(companyMap.get(companyCell).getId()); + } + } } } diff --git a/mt/src/main/resources/druid-dev.yml b/mt/src/main/resources/druid-dev.yml index 21d1d9c5..0069ab94 100644 --- a/mt/src/main/resources/druid-dev.yml +++ b/mt/src/main/resources/druid-dev.yml @@ -28,8 +28,8 @@ spring: testOnReturn: false testWhileIdle: true timeBetweenEvictionRunsMillis: 60000 -# url: jdbc:mysql://49.233.89.188:3306/mt?useUnicode=true&characterEncoding=UTF-8 - url: jdbc:mysql://www.tall.wiki/mt?useUnicode=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai&autoReconnect=true + url: jdbc:mysql://49.233.89.188:3306/mt?useUnicode=true&characterEncoding=UTF-8 +# url: jdbc:mysql://www.tall.wiki/mt?useUnicode=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai&autoReconnect=true username: root validationQuery: SELECT 1 FROM DUAL # env: CCSENS_GAME diff --git a/mt/src/main/resources/mapper_dao/CompeteCompanyDao.xml b/mt/src/main/resources/mapper_dao/CompeteCompanyDao.xml index 1920e3d3..ff3e499e 100644 --- a/mt/src/main/resources/mapper_dao/CompeteCompanyDao.xml +++ b/mt/src/main/resources/mapper_dao/CompeteCompanyDao.xml @@ -473,5 +473,25 @@ tcc.id ) t2 ON t2.companyId = t3.companyId - + + \ No newline at end of file diff --git a/mt/src/main/resources/mapper_dao/CompetePlayerDao.xml b/mt/src/main/resources/mapper_dao/CompetePlayerDao.xml index 0df906f9..fdb31a0b 100644 --- a/mt/src/main/resources/mapper_dao/CompetePlayerDao.xml +++ b/mt/src/main/resources/mapper_dao/CompetePlayerDao.xml @@ -467,4 +467,21 @@ GROUP BY g.projectId,g.id ORDER BY g.projectId,g.sequence + + \ No newline at end of file From d0fe8cfd2c7120349d0eac7d8241087ae2093eb7 Mon Sep 17 00:00:00 2001 From: ma <1062634917@qq.com> Date: Thu, 17 Jun 2021 11:15:11 +0800 Subject: [PATCH 2/5] =?UTF-8?q?mt=E5=AF=BC=E5=85=A5=E5=86=B3=E8=B5=9Bexcel?= =?UTF-8?q?-=E5=AE=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/ccsens/mt/service/ImportService.java | 216 ++++++++++++++++-- .../mapper_dao/CompeteCompanyDao.xml | 25 +- 2 files changed, 212 insertions(+), 29 deletions(-) diff --git a/mt/src/main/java/com/ccsens/mt/service/ImportService.java b/mt/src/main/java/com/ccsens/mt/service/ImportService.java index 2349ac4b..8bef7455 100644 --- a/mt/src/main/java/com/ccsens/mt/service/ImportService.java +++ b/mt/src/main/java/com/ccsens/mt/service/ImportService.java @@ -5,13 +5,19 @@ import cn.hutool.core.collection.CollectionUtil; import cn.hutool.core.lang.Snowflake; 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.*; 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.mt.persist.dao.CompeteTeamDao; +import com.ccsens.mt.persist.mapper.CompeteCoachMapper; +import com.ccsens.mt.persist.mapper.CompeteGroupMapper; +import com.ccsens.mt.persist.mapper.CompeteProjectPlayerMapper; +import com.ccsens.mt.persist.mapper.CompeteTeamMemberMapper; import com.ccsens.util.ExcelUtil; import com.ccsens.util.StringUtil; +import com.ccsens.util.exception.BaseException; import lombok.extern.slf4j.Slf4j; import org.apache.poi.xssf.usermodel.XSSFSheet; import org.apache.poi.xssf.usermodel.XSSFWorkbook; @@ -40,6 +46,18 @@ public class ImportService implements IImportService{ private Snowflake snowflake; @Resource private CompetePlayerDao competePlayerDao; + @Resource + private CompeteProjectDao competeProjectDao; + @Resource + private CompeteGroupMapper groupMapper; + @Resource + private CompeteProjectPlayerMapper projectPlayerMapper; + @Resource + private CompeteTeamDao teamDao; + @Resource + private CompeteTeamMemberMapper teamMemberMapper; + @Resource + private CompeteCoachMapper coachMapper; @Override @@ -74,25 +92,46 @@ public class ImportService implements IImportService{ private void readSheet(XSSFSheet sheet, int type, List errorPlayers) { Map companyMap = new HashMap<>(); Map playerMap = new HashMap<>(); + Map projectMap = new HashMap<>(); + Map groupMap = new HashMap<>(); + Map oldCompanyMap = new HashMap<>(); + //查找比赛项目的projectMap + CompeteProjectExample projectExample = new CompeteProjectExample(); + projectExample.createCriteria().andTypeEqualTo((byte)7); + List competeProjects = competeProjectDao.selectByExample(projectExample); + if (CollectionUtil.isNotEmpty(competeProjects)){ + for (CompeteProject competeProject : competeProjects) { + projectMap.put(competeProject.getName(),competeProject); + } + } + //查找比赛组的groupMap + CompeteGroupExample groupExample = new CompeteGroupExample(); + groupExample.createCriteria().andTypeEqualTo((byte)7); + List competeGroups = groupMapper.selectByExample(groupExample); + if (CollectionUtil.isNotEmpty(competeGroups)){ + for (CompeteGroup competeGroup : competeGroups) { + groupMap.put(competeGroup.getGroupName(),competeGroup); + } + } + for (int i = 1; i < sheet.getLastRowNum(); i++) { //参赛单位 - String companyCell = StringUtil.replaceStrSpace(ExcelUtil.getCellValue(sheet.getRow(i).getCell(2))); + String companyCell = StringUtil.replaceStrSpace(ExcelUtil.getCellValue(sheet.getRow(i).getCell(0))); //参赛项目 - String projectCell = StringUtil.replaceStrSpace(ExcelUtil.getCellValue(sheet.getRow(i).getCell(0))); + String projectCell = StringUtil.replaceStrSpace(ExcelUtil.getCellValue(sheet.getRow(i).getCell(1))); //组别 - String groupCell = StringUtil.replaceStrSpace(ExcelUtil.getCellValue(sheet.getRow(i).getCell(1))); + String groupCell = StringUtil.replaceStrSpace(ExcelUtil.getCellValue(sheet.getRow(i).getCell(2))); //选手姓名 String playerCell = StringUtil.replaceStrSpace(ExcelUtil.getCellValue(sheet.getRow(i).getCell(3))); - String[] playerNames = new String[]{playerCell}; - if(StrUtil.isNotBlank(playerCell)){ - playerNames = playerCell.split("、"); - } - //查找参赛单位 + //查找参赛单位 TODO 选手名字(playerCell) 项目名字(projectCell)没有用来查询 + if (!companyMap.containsKey(companyCell)){ + String[] playerNames = playerCell.split("、"); List company = competeCompanyDao.getCompanyByNameAndType(companyCell,playerNames[0],projectCell,type); if (CollectionUtil.isNotEmpty(company)){ + oldCompanyMap.put(companyCell,company.get(0).getId()); //查看是该单位是否已经进决赛 - List companyByNameAndType = competeCompanyDao.getCompanyByNameAndType(companyCell, playerNames[0], projectCell, 7); + List companyByNameAndType = competeCompanyDao.getCompanyByNameAndType(companyCell, playerCell, projectCell, 7); if (CollectionUtil.isEmpty(companyByNameAndType)){ //复制参赛单位到决赛 CompeteCompany newCompany = new CompeteCompany(); @@ -102,6 +141,19 @@ public class ImportService implements IImportService{ newCompany.setCompeteTimeId(7L); competeCompanyDao.insertSelective(newCompany); companyMap.put(companyCell,newCompany); + //复制教练 + CompeteCoachExample coachExample = new CompeteCoachExample(); + coachExample.createCriteria().andCompanyIdEqualTo(company.get(0).getId()); + List competeCoaches = coachMapper.selectByExample(coachExample); + if (CollectionUtil.isNotEmpty(competeCoaches)){ + for (CompeteCoach competeCoach : competeCoaches) { + CompeteCoach newCoach = new CompeteCoach(); + BeanUtil.copyProperties(competeCoach,newCoach); + newCoach.setId(snowflake.nextId()); + newCoach.setCompanyId(newCompany.getId()); + coachMapper.insertSelective(newCoach); + } + } } }else{ CompeteExcelVo.ErrorPlayer errorPlayer = new CompeteExcelVo.ErrorPlayer(); @@ -109,18 +161,146 @@ public class ImportService implements IImportService{ errorPlayer.setRowNum(i); errorPlayer.setRemark("未查找原参赛单位"); errorPlayers.add(errorPlayer); + log.info("报错相关信息学:{}",errorPlayer); + throw new BaseException("未查找原参赛单位:"+i+"行"+"信息"+companyCell); + } + } + //添加比赛成员 + if (StrUtil.isNotBlank(playerCell)){ + String[] playerNames = playerCell.split("、"); + for (String playerName : playerNames) { + if (!playerMap.containsKey(playerName)){ + List company = competeCompanyDao.getCompanyByNameAndType(companyCell,playerName,projectCell,type); + if (CollectionUtil.isNotEmpty(company)){ + //查找旧的成员信息 + List playerList = competePlayerDao.getPlayerByNameAndCompany(playerName,oldCompanyMap.get(companyCell)); + if (CollectionUtil.isNotEmpty(playerList)){ + CompetePlayer newPlayer = new CompetePlayer(); + BeanUtil.copyProperties(playerList.get(0),newPlayer); + newPlayer.setId(snowflake.nextId()); + newPlayer.setCompanyId(companyMap.get(companyCell).getId()); +// newPlayer.setCompeteGroupId(groupMap.get(groupCell).getId()); + competePlayerDao.insertSelective(newPlayer); + playerMap.put(playerName,newPlayer); + }else{ + CompeteExcelVo.ErrorPlayer errorPlayer = new CompeteExcelVo.ErrorPlayer(); + errorPlayer.setSheetName(playerName); + errorPlayer.setRowNum(i); + errorPlayer.setRemark("未找到该比赛成员信息"); + errorPlayers.add(errorPlayer); + log.info("报错相关信息学:{}",errorPlayer); + throw new BaseException("未找到该比赛成员信息:"+i+"行"+"信息"+playerName); + } + } + } } } - //添加选手信息 - List playerList = competePlayerDao.getPlayerByNameAndCompany(playerCell,companyMap.get(companyCell).getId()); - if (CollectionUtil.isNotEmpty(playerList)){ - CompetePlayer newPlayer = new CompetePlayer(); - BeanUtil.copyProperties(playerList.get(0),newPlayer); - newPlayer.setId(snowflake.nextId()); - newPlayer.setCompanyId(companyMap.get(companyCell).getId()); + + CompeteProject project = projectMap.get(projectCell); + if (ObjectUtil.isNotNull(project)){ + //个人项目 + if (0 == project.getTeam()){ + CompeteProjectPlayer projectPlayer = new CompeteProjectPlayer(); + projectPlayer.setId(snowflake.nextId()); + projectPlayer.setPlayerId(playerMap.get(playerCell).getId()); + projectPlayer.setProjectId(projectMap.get(projectCell).getId()); + projectPlayer.setCompeteGroupId(groupMap.get(groupCell).getId()); + projectPlayer.setCompeteTimeId(7L); + projectPlayerMapper.insertSelective(projectPlayer); + } + //团队项目 + if (1 == project.getTeam()){ + if (groupCell.contains("男子") || groupCell.contains("女子")){ + CompeteTeam newTeam = new CompeteTeam(); + newTeam.setId(snowflake.nextId()); + newTeam.setProjectId(projectMap.get(projectCell).getId()); + newTeam.setCompeteTimeId(7L); + newTeam.setGenderGroup(groupMap.get(groupCell).getSex()); + newTeam.setCompeteGroupId(groupMap.get(groupCell).getId()); + newTeam.setGroupRemark(groupMap.get(groupCell).getGroupRemark()); + newTeam.setCompanyId(companyMap.get(companyCell).getId()); + teamDao.insertSelective(newTeam); + if (StrUtil.isNotBlank(playerCell)){ + String[] playNames = playerCell.split("、"); + for (String playName : playNames) { + CompeteTeamMember teamMember = new CompeteTeamMember(); + teamMember.setId(snowflake.nextId()); + teamMember.setPlayerId(playerMap.get(playName).getId()); + teamMember.setCompeteTeamId(newTeam.getId()); + teamMemberMapper.insertSelective(teamMember); + } + } + } + if (groupCell.contains("不限")){ + CompeteTeam newTeam = new CompeteTeam(); + newTeam.setId(snowflake.nextId()); + newTeam.setProjectId(projectMap.get(projectCell).getId()); + newTeam.setCompeteTimeId(7L); + //TODO 性别 组别id 组别描述 暂时使用默认值 + newTeam.setCompanyId(companyMap.get(companyCell).getId()); + teamDao.insertSelective(newTeam); + if (StrUtil.isNotBlank(playerCell)){ + String[] playNames = playerCell.split("、"); + for (String playName : playNames) { + CompeteTeamMember teamMember = new CompeteTeamMember(); + teamMember.setId(snowflake.nextId()); + teamMember.setPlayerId(playerMap.get(playName).getId()); + teamMember.setCompeteTeamId(newTeam.getId()); + teamMemberMapper.insertSelective(teamMember); + } + } + } + } + }else{ + CompeteExcelVo.ErrorPlayer errorPlayer = new CompeteExcelVo.ErrorPlayer(); + errorPlayer.setSheetName(projectCell); + errorPlayer.setRowNum(i); + errorPlayer.setRemark("未查找到该比赛项目"); + errorPlayers.add(errorPlayer); + log.info("报错相关信息学:{}",errorPlayer); + throw new BaseException("未查找比赛项目:"+i+"行"+"信息"+projectCell); } + +// String[] playerNames = new String[]{playerCell}; +// if(StrUtil.isNotBlank(playerCell)){ +// playerNames = playerCell.split("、"); +// } +// //查找参赛单位 +// if (!companyMap.containsKey(companyCell)){ +// List company = competeCompanyDao.getCompanyByNameAndType(companyCell,playerNames[0],projectCell,type); +// if (CollectionUtil.isNotEmpty(company)){ +// //查看是该单位是否已经进决赛 +// List companyByNameAndType = competeCompanyDao.getCompanyByNameAndType(companyCell, playerNames[0], projectCell, 7); +// if (CollectionUtil.isEmpty(companyByNameAndType)){ +// //复制参赛单位到决赛 +// CompeteCompany newCompany = new CompeteCompany(); +// BeanUtil.copyProperties(company.get(0),newCompany); +// newCompany.setId(snowflake.nextId()); +// newCompany.setType((byte)7); +// newCompany.setCompeteTimeId(7L); +// competeCompanyDao.insertSelective(newCompany); +// companyMap.put(companyCell,newCompany); +// } +// }else{ +// CompeteExcelVo.ErrorPlayer errorPlayer = new CompeteExcelVo.ErrorPlayer(); +// errorPlayer.setSheetName(companyCell); +// errorPlayer.setRowNum(i); +// errorPlayer.setRemark("未查找原参赛单位"); +// errorPlayers.add(errorPlayer); +// } +// } +// +// //添加选手信息 +// List playerList = competePlayerDao.getPlayerByNameAndCompany(playerCell,companyMap.get(companyCell).getId()); +// if (CollectionUtil.isNotEmpty(playerList)){ +// CompetePlayer newPlayer = new CompetePlayer(); +// BeanUtil.copyProperties(playerList.get(0),newPlayer); +// newPlayer.setId(snowflake.nextId()); +// newPlayer.setCompanyId(companyMap.get(companyCell).getId()); +// } + } } } diff --git a/mt/src/main/resources/mapper_dao/CompeteCompanyDao.xml b/mt/src/main/resources/mapper_dao/CompeteCompanyDao.xml index ff3e499e..3c0fffa3 100644 --- a/mt/src/main/resources/mapper_dao/CompeteCompanyDao.xml +++ b/mt/src/main/resources/mapper_dao/CompeteCompanyDao.xml @@ -476,22 +476,25 @@ \ No newline at end of file From 68a5198e4846528356d2a1b919ff134eb01ca5c4 Mon Sep 17 00:00:00 2001 From: ma <1062634917@qq.com> Date: Thu, 17 Jun 2021 11:15:45 +0800 Subject: [PATCH 3/5] =?UTF-8?q?mt=E5=AF=BC=E5=85=A5=E5=86=B3=E8=B5=9Bexcel?= =?UTF-8?q?-=E5=AE=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- mt/src/main/java/com/ccsens/mt/service/ImportService.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mt/src/main/java/com/ccsens/mt/service/ImportService.java b/mt/src/main/java/com/ccsens/mt/service/ImportService.java index 8bef7455..e8d77e16 100644 --- a/mt/src/main/java/com/ccsens/mt/service/ImportService.java +++ b/mt/src/main/java/com/ccsens/mt/service/ImportService.java @@ -123,7 +123,7 @@ public class ImportService implements IImportService{ String groupCell = StringUtil.replaceStrSpace(ExcelUtil.getCellValue(sheet.getRow(i).getCell(2))); //选手姓名 String playerCell = StringUtil.replaceStrSpace(ExcelUtil.getCellValue(sheet.getRow(i).getCell(3))); - //查找参赛单位 TODO 选手名字(playerCell) 项目名字(projectCell)没有用来查询 + //查找参赛单位 项目名字(projectCell)没有用来查询 if (!companyMap.containsKey(companyCell)){ String[] playerNames = playerCell.split("、"); From 4a27d521ce2007b33647ee8e3cecbf425aa81adf Mon Sep 17 00:00:00 2001 From: ma <1062634917@qq.com> Date: Thu, 17 Jun 2021 14:34:10 +0800 Subject: [PATCH 4/5] =?UTF-8?q?mt=E5=AF=BC=E5=85=A5=E5=86=B3=E8=B5=9Bexcel?= =?UTF-8?q?-=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- mt/src/main/resources/application.yml | 4 ++-- mt/src/main/resources/mapper_dao/CompetePlayerDao.xml | 3 ++- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/mt/src/main/resources/application.yml b/mt/src/main/resources/application.yml index a47f2a7b..ac92adb9 100644 --- a/mt/src/main/resources/application.yml +++ b/mt/src/main/resources/application.yml @@ -1,6 +1,6 @@ spring: profiles: - active: dev - include: common, util-dev + active: test + include: common, util-test diff --git a/mt/src/main/resources/mapper_dao/CompetePlayerDao.xml b/mt/src/main/resources/mapper_dao/CompetePlayerDao.xml index fdb31a0b..96b8b009 100644 --- a/mt/src/main/resources/mapper_dao/CompetePlayerDao.xml +++ b/mt/src/main/resources/mapper_dao/CompetePlayerDao.xml @@ -476,7 +476,8 @@ id_card AS idCard, phone, gender, - company_id AS companyId + company_id AS companyId, + compete_group_id AS competeGroupId FROM t_compete_player AS cp WHERE From 1b0c55cf7786340ccafef5b85e7fd22441d75a35 Mon Sep 17 00:00:00 2001 From: ma <1062634917@qq.com> Date: Thu, 17 Jun 2021 14:35:58 +0800 Subject: [PATCH 5/5] =?UTF-8?q?mt=E5=AF=BC=E5=85=A5=E5=86=B3=E8=B5=9Bexcel?= =?UTF-8?q?-=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/ccsens/mt/service/ImportService.java | 2 ++ mt/src/main/resources/mapper_dao/CompetePlayerDao.xml | 9 +-------- 2 files changed, 3 insertions(+), 8 deletions(-) diff --git a/mt/src/main/java/com/ccsens/mt/service/ImportService.java b/mt/src/main/java/com/ccsens/mt/service/ImportService.java index e8d77e16..fc7b2854 100644 --- a/mt/src/main/java/com/ccsens/mt/service/ImportService.java +++ b/mt/src/main/java/com/ccsens/mt/service/ImportService.java @@ -179,6 +179,8 @@ public class ImportService implements IImportService{ BeanUtil.copyProperties(playerList.get(0),newPlayer); newPlayer.setId(snowflake.nextId()); newPlayer.setCompanyId(companyMap.get(companyCell).getId()); + newPlayer.setCreatedAt(null); + newPlayer.setUpdatedAt(null); // newPlayer.setCompeteGroupId(groupMap.get(groupCell).getId()); competePlayerDao.insertSelective(newPlayer); playerMap.put(playerName,newPlayer); diff --git a/mt/src/main/resources/mapper_dao/CompetePlayerDao.xml b/mt/src/main/resources/mapper_dao/CompetePlayerDao.xml index 96b8b009..3075d00c 100644 --- a/mt/src/main/resources/mapper_dao/CompetePlayerDao.xml +++ b/mt/src/main/resources/mapper_dao/CompetePlayerDao.xml @@ -470,14 +470,7 @@