Merge branch 'pt' of dd.tall.wiki:ccsens_wiki/ccsenscloud into pt

mt/src/main/java/com/ccsens/mt/persist/dao/CompeteScoreDao.java

@@ -1,12 +1,8 @@
 package com.ccsens.mt.persist.dao;
 
-import com.ccsens.mt.bean.po.CompeteCoach;
-import com.ccsens.mt.bean.po.CompeteCompany;
 import com.ccsens.mt.bean.vo.CompeteExcelVo;
 import com.ccsens.mt.bean.vo.CompeteVo;
-import com.ccsens.mt.bean.vo.ProvinceCompeteVo;
 import com.ccsens.mt.bean.vo.ScoreVo;
-import com.ccsens.mt.persist.mapper.CompeteCompanyMapper;
 import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Repository;
 
@@ -93,9 +89,10 @@ public interface CompeteScoreDao  {
     /**
      * 统计花样赛成绩
      * @param projectId 项目ID
+     * @param page 第几条
      * @return 成绩
      */
-    List<CompeteVo.TotalScoreDisplay> queryVarietyScore(@Param("projectId") Long projectId);
+    List<CompeteVo.TotalScoreDisplay> queryVarietyScore(@Param("projectId") Long projectId, @Param("page") int page);
 
     /**
      * 查询花样赛某一场的成绩

mt/src/main/java/com/ccsens/mt/service/CompeteService.java

@@ -216,7 +216,7 @@ public class CompeteService implements ICompeteService {
     @Override
     public PageInfo<CompeteVo.TotalScoreDisplay> showResult(ScoreDto.ShowResultW param) {
         PageHelper.startPage(param.getPageNum(), param.getPageSize());
-        List<CompeteVo.TotalScoreDisplay> list =  competeScoreDao.queryVarietyScore(param.getProjectId());
+        List<CompeteVo.TotalScoreDisplay> list =  competeScoreDao.queryVarietyScore(param.getProjectId(), (param.getPageNum()-1)*param.getPageSize() );
         return new PageInfo<>(list);
     }
 //    public List<CompeteVo.TotalScoreDisplay> showResult(ScoreDto.ShowResultW param) {

mt/src/main/java/com/ccsens/mt/service/ExcelService.java

@@ -22,7 +22,6 @@ import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
 import lombok.extern.slf4j.Slf4j;
 
-import org.apache.poi.ss.usermodel.Table;
 import org.apache.poi.ss.usermodel.Workbook;
 import org.apache.poi.xssf.usermodel.XSSFWorkbook;
 import org.eclipse.jetty.util.StringUtil;
@@ -38,9 +37,7 @@ import java.io.OutputStream;
 import java.text.SimpleDateFormat;
 
 import java.util.ArrayList;
-import java.util.Comparator;
 import java.util.Date;
-import java.util.LinkedList;
 import java.util.List;
 
 @Slf4j
@@ -1234,7 +1231,7 @@ public class ExcelService implements IExcelService {
     @Override
     public String patternExpTable(ScoreDto.ShowResultNoPage param) {
         //List<CompeteVo.TotalScoreDisplay> totalScoreDisplays = competeService.showResultPage(param);
-        List<CompeteVo.TotalScoreDisplay> totalScoreDisplays =  competeScoreDao.queryVarietyScore(param.getProjectId());
+        List<CompeteVo.TotalScoreDisplay> totalScoreDisplays =  competeScoreDao.queryVarietyScore(param.getProjectId(), (param.getPageNum() - 1) * param.getPageSize());
         List<List<PoiUtil.PoiUtilCell>> list = new ArrayList<>();
         List<PoiUtil.PoiUtilCell> zero=new ArrayList<>();
         PoiUtil.PoiUtilCell zeroOne=new PoiUtil.PoiUtilCell("比赛成绩公示(花样赛)", 14, 1);

mt/src/main/resources/mapper_dao/CompeteScoreDao.xml

@@ -726,7 +726,7 @@
         group by s.site_order_id
         order by result desc
         	)t,
-	(SELECT @rownum := 0)t1
+	(SELECT @rownum := ${page})t1
     </select>
     <select id="selAllDaiBiaoDui" resultType="com.ccsens.mt.bean.vo.CompeteVo$DaiBiaoDUi">
             select q.*,identity,GROUP_CONCAT(tcch.name) as name  From