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 24fc463a..a810070f 100644 --- a/mt/src/main/java/com/ccsens/mt/service/ExcelService.java +++ b/mt/src/main/java/com/ccsens/mt/service/ExcelService.java @@ -346,6 +346,8 @@ public class ExcelService implements IExcelService { for (CompeteProjectPlayer competeProjectPlayer : competeProjectPlayerList) { //查询每个报名人的详细信息下 CompetePlayer competePlayer = competePlayerDao.selectByPrimaryKey(competeProjectPlayer.getPlayerId()); + if(ObjectUtil.isNotNull(competePlayer)){ + TableVo.CompeteJoin competeJoin = new TableVo.CompeteJoin(); //姓名 competeJoin.setName(competePlayer.getName()); @@ -401,6 +403,7 @@ public class ExcelService implements IExcelService { //项目id competeJoin.setProjectId(competeProject.getId()); competeJoinList.add(competeJoin); + } } } else { //团队项目 @@ -416,6 +419,8 @@ public class ExcelService implements IExcelService { for (CompeteTeamMember competeTeamMember : competeTeamMemberList) { //查询成员详细信息 CompetePlayer competePlayer = competePlayerDao.selectByPrimaryKey(competeTeamMember.getPlayerId()); + if(ObjectUtil.isNotNull(competePlayer)){ + TableVo.CompeteJoin competeJoin = new TableVo.CompeteJoin(); //姓名 competeJoin.setName(competePlayer.getName()); @@ -474,6 +479,7 @@ public class ExcelService implements IExcelService { competeJoin.setProjectId(competeProject.getId()); competeJoinList.add(competeJoin); } + } } } } @@ -552,7 +558,7 @@ public class ExcelService implements IExcelService { OutputStream stream = new FileOutputStream(file); wbs.write(stream); stream.close(); - return path; + return PropUtil.imgDomain+filepath; } @@ -650,7 +656,7 @@ public class ExcelService implements IExcelService { OutputStream stream = new FileOutputStream(file); wbs.write(stream); stream.close(); - return path; + return PropUtil.imgDomain+filepath; } @Override @@ -948,7 +954,7 @@ public class ExcelService implements IExcelService { i++; } //生成excel表格对象,并将数据放入 - Workbook wbs = PoiUtil.exportWB("XXX比赛报名汇总表", list, workbook); + Workbook wbs = PoiUtil.exportWB("比赛报名汇总表", list, workbook); //8:关联金山在线文档 String name = "参赛人数统计表" + ".xlsx"; String filepath = "mt/" + DateUtil.today() + "/" + System.currentTimeMillis() + ".xlsx"; @@ -963,7 +969,7 @@ public class ExcelService implements IExcelService { OutputStream stream = new FileOutputStream(file); wbs.write(stream); stream.close(); - return path; + return PropUtil.imgDomain+filepath; } 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/util/src/main/java/com/ccsens/util/PoiUtil.java b/util/src/main/java/com/ccsens/util/PoiUtil.java index 3bbcb1c2..af0f96ad 100644 --- a/util/src/main/java/com/ccsens/util/PoiUtil.java +++ b/util/src/main/java/com/ccsens/util/PoiUtil.java @@ -177,7 +177,7 @@ public class PoiUtil { // } CellStyle style = wb.createCellStyle(); //设置内容 - if (!cell.value.equals(WebConstant.CELL_NULL)){ + if (!WebConstant.CELL_NULL.equals(cell.value)){ if(cell.num == 1){ newCell.setCellValue(Integer.parseInt(cell.value)); }else {