From 4d9f095aa3d425c5b0e14a889fe2388c462e4efc Mon Sep 17 00:00:00 2001 From: zy_Java <654600784@qq.com> Date: Thu, 26 Nov 2020 21:04:04 +0800 Subject: [PATCH 1/2] 20201126v2.1 --- tall/src/main/resources/application.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tall/src/main/resources/application.yml b/tall/src/main/resources/application.yml index ebc544af..e75cc2c3 100644 --- a/tall/src/main/resources/application.yml +++ b/tall/src/main/resources/application.yml @@ -1,5 +1,5 @@ spring: profiles: - active: test - include: util-test,common + active: prod + include: util-prod,common From bf7c3d1485cfdc206f9fdb319017757d8f5a7f61 Mon Sep 17 00:00:00 2001 From: zhizhi wu <2377881365@qq.com> Date: Thu, 26 Nov 2020 21:13:39 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E6=8A=80=E6=9C=AF=E8=B5=9B=E6=88=90?= =?UTF-8?q?=E7=BB=A9=E6=9F=A5=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- mt/src/main/java/com/ccsens/mt/service/ExcelService.java | 2 +- mt/src/main/resources/mapper_dao/CompeteScoreDao.xml | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) 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 b2f9ed8b..084db735 100644 --- a/mt/src/main/java/com/ccsens/mt/service/ExcelService.java +++ b/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 totalScoreDisplays = competeService.showResultPage(param); - List totalScoreDisplays = competeScoreDao.queryVarietyScore(param.getProjectId(), (param.getPageNum() - 1) * param.getPageSize()); + List totalScoreDisplays = competeScoreDao.queryVarietyScore(param.getProjectId(), 0); List> list = new ArrayList<>(); List zero=new ArrayList<>(); PoiUtil.PoiUtilCell zeroOne=new PoiUtil.PoiUtilCell("比赛成绩公示(花样赛)", 14, 1); diff --git a/mt/src/main/resources/mapper_dao/CompeteScoreDao.xml b/mt/src/main/resources/mapper_dao/CompeteScoreDao.xml index e4e84fa2..2cc987be 100644 --- a/mt/src/main/resources/mapper_dao/CompeteScoreDao.xml +++ b/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