diff --git a/mt/src/main/java/com/ccsens/mt/service/CompeteService.java b/mt/src/main/java/com/ccsens/mt/service/CompeteService.java index c5b41708..205e2909 100644 --- a/mt/src/main/java/com/ccsens/mt/service/CompeteService.java +++ b/mt/src/main/java/com/ccsens/mt/service/CompeteService.java @@ -107,8 +107,8 @@ public class CompeteService implements ICompeteService { @Override - public PageInfo showResultPage(ScoreDto.ShowResultW param) { - PageHelper.startPage(param.getPageNum(),param.getPageSize()); + public List showResultPage(ScoreDto.ShowResultW param) { + //PageHelper.startPage(param.getPageNum(),param.getPageSize()); List totalScoreDisplaysList=new ArrayList<>(); CompeteStartOrderExample competeStartOrderExample =new CompeteStartOrderExample(); @@ -207,7 +207,7 @@ public class CompeteService implements ICompeteService { totalScoreDisplay.setRownum(i+1); } - return new PageInfo<>(totalScoreDisplaysList); + return totalScoreDisplaysList; } /** * 花样赛总成绩展示 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 d84164b2..68f17e7a 100644 --- a/mt/src/main/java/com/ccsens/mt/service/ExcelService.java +++ b/mt/src/main/java/com/ccsens/mt/service/ExcelService.java @@ -1332,7 +1332,7 @@ public class ExcelService implements IExcelService { @Override public String patternExpTable(ScoreDto.ShowResultW param) { - List totalScoreDisplays = competeService.showResult(param).getList(); + List totalScoreDisplays = competeService.showResultPage(param); List> list = new ArrayList<>(); List zero=new ArrayList<>(); PoiUtil.PoiUtilCell zeroOne=new PoiUtil.PoiUtilCell("比赛成绩公示(花样赛)", 14, 1); diff --git a/mt/src/main/java/com/ccsens/mt/service/ICompeteService.java b/mt/src/main/java/com/ccsens/mt/service/ICompeteService.java index 56ab4697..758e42df 100644 --- a/mt/src/main/java/com/ccsens/mt/service/ICompeteService.java +++ b/mt/src/main/java/com/ccsens/mt/service/ICompeteService.java @@ -155,7 +155,7 @@ public interface ICompeteService { void submitOrderList(ScoreDto.InformationSubmitted param); - PageInfo showResultPage(ScoreDto.ShowResultW param); + List showResultPage(ScoreDto.ShowResultW param); PageInfo showResult(ScoreDto.ShowResultW param);