diff --git a/mt/src/main/java/com/ccsens/mt/service/ExcelService.java b/mt/src/main/java/com/ccsens/mt/service/ExcelService.java index b1589cf8..21372c34 100644 --- a/mt/src/main/java/com/ccsens/mt/service/ExcelService.java +++ b/mt/src/main/java/com/ccsens/mt/service/ExcelService.java @@ -638,14 +638,14 @@ public class ExcelService implements IExcelService { private List competeJoinCountList(CompeteDto.CompeteTime params) { List competeOverviewList = competeCompanyDao.selectCompeteJoinCountList(params.getCompeteTimeId()); List list = new LinkedList<>(); - for (TableVo.CompeteOverview mes : competeOverviewList){ - if (mes.getCoachNum() != 0 && mes.getGuideNum() != 0 && mes.getPlayerNum() != 0){ + competeOverviewList.forEach(mes->{ + if (mes.getGuideNum()!=0 && mes.getCoachNum()!=0 && mes.getPlayerNum()!=0){ int num = mes.getCoachNum()+mes.getPlayerNum()+mes.getGuideNum(); mes.setSum(num); list.add(mes); } - } + }); return list; diff --git a/mt/src/main/resources/application.yml b/mt/src/main/resources/application.yml index f59084b0..4ecd13fd 100644 --- a/mt/src/main/resources/application.yml +++ b/mt/src/main/resources/application.yml @@ -1,5 +1,5 @@ spring: profiles: - active: test - include: common, util-test + active: dev + include: common, util-dev diff --git a/mt/src/main/resources/mapper_dao/CompeteCompanyDao.xml b/mt/src/main/resources/mapper_dao/CompeteCompanyDao.xml index bea9e374..34b64e98 100644 --- a/mt/src/main/resources/mapper_dao/CompeteCompanyDao.xml +++ b/mt/src/main/resources/mapper_dao/CompeteCompanyDao.xml @@ -401,15 +401,20 @@ \ No newline at end of file