From 3983c61ba7744afbf30d9e05f1efb1bf74ea902e Mon Sep 17 00:00:00 2001
From: wang0018 <1007152140@qq.com>
Date: Sat, 21 Nov 2020 17:56:45 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/ccsens/mt/service/CompeteService.java   | 17 +++++++++++------
 mt/src/main/resources/application.yml           |  4 ++--
 2 files changed, 13 insertions(+), 8 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 c1ce0ad6..41efae93 100644
--- a/mt/src/main/java/com/ccsens/mt/service/CompeteService.java
+++ b/mt/src/main/java/com/ccsens/mt/service/CompeteService.java
@@ -111,6 +111,9 @@ public class CompeteService implements ICompeteService {
         CompeteStartOrderExample competeStartOrderExample =new CompeteStartOrderExample();
         competeStartOrderExample.createCriteria().andProjectIdEqualTo(param.getProjectId()).andRecStatusEqualTo((byte) 0);
         List<CompeteStartOrder> competeStartOrdersList = competeStartOrderMapper.selectByExample(competeStartOrderExample);
+        if(competeStartOrdersList.size()<1){
+            throw new BaseException(CodeEnum.PARAM_ERROR);
+        }
         competeStartOrdersList.forEach(competeStartOrder -> {
             //一个人或者一个团队得数据
             CompeteVo.TotalScoreDisplay totalScoreDisplay = new CompeteVo.TotalScoreDisplay();
@@ -139,10 +142,11 @@ public class CompeteService implements ICompeteService {
                 StringBuilder stringBuilder=new StringBuilder("");
                 competeTeamMemberList.forEach(mes->{
                     CompetePlayer competePlayer = competePlayerDao.selectByPrimaryKey(mes.getPlayerId());
-                    stringBuilder.append(competePlayer.getName());
+                    stringBuilder.append(competePlayer.getName()+"、");
                 });
-                totalScoreDisplay.setPeopleName(stringBuilder.toString());
-                totalScoreDisplay.setPeopleName(stringBuilder.toString().substring(0,stringBuilder.length()));
+               // totalScoreDisplay.setPeopleName(stringBuilder.toString());
+                String namesss=stringBuilder.toString().substring(0,stringBuilder.length()-1);
+                totalScoreDisplay.setPeopleName(namesss);
             }
             List<CompeteVo.Result> results = competeTimeDao.selectJudgmentS(competeStartOrder.getId());
             //7个教练成绩也上去了
@@ -244,9 +248,9 @@ public class CompeteService implements ICompeteService {
                 StringBuilder stringBuilder=new StringBuilder("");
                 competeTeamMemberList.forEach(mes->{
                     CompetePlayer competePlayer = competePlayerDao.selectByPrimaryKey(mes.getPlayerId());
-                    stringBuilder.append(competePlayer.getName());
+                    stringBuilder.append(competePlayer.getName()+"、");
                 });
-                totalScoreDisplay.setPeopleName(stringBuilder.toString());
+                //totalScoreDisplay.setPeopleName(stringBuilder.toString());
 //                CompeteTeamMemberExample competeTeamMemberExample =new CompeteTeamMemberExample();
 //                competeTeamMemberExample.createCriteria().andCompeteTeamIdEqualTo(competeStartOrder.getPlayerId());
 //                List<CompeteTeamMember> competeTeamMembersList = competeTeamMemberMapper.selectByExample(competeTeamMemberExample);
@@ -254,7 +258,8 @@ public class CompeteService implements ICompeteService {
 //                competeTeamMembersList.forEach(competeTeamMember -> {
 //                    stringBuilder.append(competePlayerDao.selectByPrimaryKey(competeTeamMember.getPlayerId()).getName()+'、');
 //                });
-                totalScoreDisplay.setPeopleName(stringBuilder.toString().substring(0,stringBuilder.length()));
+                String namess=stringBuilder.toString().substring(0,stringBuilder.length()-1);
+                totalScoreDisplay.setPeopleName(namess);
             }
             List<CompeteVo.Result> results = competeTimeDao.selectJudgmentS(competeStartOrder.getId());
             //7个教练成绩也上去了
diff --git a/mt/src/main/resources/application.yml b/mt/src/main/resources/application.yml
index f59084b0..4ecd13fd 100644
--- a/mt/src/main/resources/application.yml
+++ b/mt/src/main/resources/application.yml
@@ -1,5 +1,5 @@
 spring:
   profiles:
-    active: test
-    include: common, util-test
+    active: dev
+    include: common, util-dev