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

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

@@ -1231,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(), (param.getPageNum() - 1) * param.getPageSize());
+        List<CompeteVo.TotalScoreDisplay> totalScoreDisplays =  competeScoreDao.queryVarietyScore(param.getProjectId(), 0);
         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

@@ -92,7 +92,7 @@
         cs.final_score as finalScore
     FROM
     t_compete_start_order so
-    LEFT JOIN t_compete_count_score  cs on cs.site_order_id = so.id
+    LEFT JOIN t_compete_count_score  cs on cs.site_order_id = so.id and cs.rec_status = 0
     LEFT JOIN t_compete_project cp on so.project_id = cp.id
     LEFT JOIN t_compete_project_player pp on so.player_id = pp.id
     LEFT JOIN t_compete_player p on pp.player_id = p.id
@@ -100,7 +100,6 @@
     LEFT JOIN t_compete_company c on p.company_id = c.id
     WHERE
     so.id = #{siteId}
-      and cs.rec_status = 0
     and so.rec_status = 0
     and cp.rec_status = 0
     and pp.rec_status = 0

tall/src/main/resources/application.yml

@@ -1,5 +1,5 @@
 spring:
   profiles:
-    active: test
-    include: util-test,common
+    active: prod
+    include: util-prod,common