From 5cbb4b636a4cabc908cb1eb87d9898f0498a3e38 Mon Sep 17 00:00:00 2001
From: wang0018 <1007152140@qq.com>
Date: Mon, 23 Nov 2020 17:50:19 +0800
Subject: [PATCH] =?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/java/com/ccsens/mt/service/CompeteService.java  | 6 +++---
 mt/src/main/java/com/ccsens/mt/service/ExcelService.java    | 2 +-
 mt/src/main/java/com/ccsens/mt/service/ICompeteService.java | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

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<CompeteVo.TotalScoreDisplay> showResultPage(ScoreDto.ShowResultW param) {
-        PageHelper.startPage(param.getPageNum(),param.getPageSize());
+    public List<CompeteVo.TotalScoreDisplay> showResultPage(ScoreDto.ShowResultW param) {
+        //PageHelper.startPage(param.getPageNum(),param.getPageSize());
         List<CompeteVo.TotalScoreDisplay> 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<CompeteVo.TotalScoreDisplay> totalScoreDisplays = competeService.showResult(param).getList();
+        List<CompeteVo.TotalScoreDisplay> totalScoreDisplays = competeService.showResultPage(param);
         List<List<PoiUtil.PoiUtilCell>> list = new ArrayList<>();
         List<PoiUtil.PoiUtilCell> 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<CompeteVo.TotalScoreDisplay> showResultPage(ScoreDto.ShowResultW param);
+    List<CompeteVo.TotalScoreDisplay> showResultPage(ScoreDto.ShowResultW param);
 
     PageInfo<CompeteVo.TotalScoreDisplay> showResult(ScoreDto.ShowResultW param);