From 45630478d2dca47ac8365344db141c8f704ecd54 Mon Sep 17 00:00:00 2001
From: zy_Java <654600784@qq.com>
Date: Mon, 16 Nov 2020 15:02:10 +0800
Subject: [PATCH] 20201116v1.2

---
 .../com/ccsens/mt/service/CompeteService.java | 22 ++++++++++++-------
 mt/src/main/resources/application.yml         |  4 ++--
 .../mapper_dao/CompeteProjectConfigDao.xml    |  3 ++-
 3 files changed, 18 insertions(+), 11 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 aad60092..21ead7c0 100644
--- a/mt/src/main/java/com/ccsens/mt/service/CompeteService.java
+++ b/mt/src/main/java/com/ccsens/mt/service/CompeteService.java
@@ -84,11 +84,15 @@ public class CompeteService implements ICompeteService {
     @Resource
     private TallFeignClient tallFeignClient;
     @Resource
-    private CommonFileMapper commonFileMapper;
-    @Resource
     private CompeteStartOrderMapper competeStartOrderMapper;
     @Resource
     private CompeteVarietyScoreMapper competeVarietyScoreMapper;
+    @Resource
+    private CompeteProjectConfigDao competeProjectConfigDao;
+    @Resource
+    private  CompeteScoreDao competeScoreDao;
+    @Resource
+    private  CompeteCountScoreMapper competeCountScoreMapper;
 
     /**
      * 花样赛总成绩展示
@@ -183,11 +187,6 @@ public class CompeteService implements ICompeteService {
         return null;
     }
 
-    private CompeteProjectConfigDao competeProjectConfigDao;
-    @Resource
-    private  CompeteScoreDao competeScoreDao;
-    @Resource
-    private  CompeteCountScoreMapper competeCountScoreMapper;
 
     /**
      * 查看第几届
@@ -1143,7 +1142,14 @@ public class CompeteService implements ICompeteService {
         List<CompeteProject> competeProjectList = competeProjectMapper.selectByExample(competeProjectExample);
         for(CompeteProject competeProject : competeProjectList) {
             long projectId = competeProject.getId();
-            CompeteProjectConfig competeProjectConfig = competeProjectConfigDao.selectStartTime(projectId);
+//            CompeteProjectConfig competeProjectConfig = competeProjectConfigDao.selectStartTime(projectId);
+            CompeteProjectConfig competeProjectConfig = null;
+            CompeteProjectConfigExample projectConfigExample = new CompeteProjectConfigExample();
+            projectConfigExample.createCriteria().andProjectIdEqualTo(projectId);
+            List<CompeteProjectConfig> projectConfigList = competeProjectConfigDao.selectByExample(projectConfigExample);
+            if(CollectionUtil.isNotEmpty(projectConfigList)){
+                competeProjectConfig = projectConfigList.get(0);
+            }
             if (ObjectUtil.isNotNull(competeProjectConfig)) {
                 CompeteVo.CountScore countScore = new CompeteVo.CountScore();
                 countScore.setId(competeProject.getId());
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
 
diff --git a/mt/src/main/resources/mapper_dao/CompeteProjectConfigDao.xml b/mt/src/main/resources/mapper_dao/CompeteProjectConfigDao.xml
index d7147743..2591e528 100644
--- a/mt/src/main/resources/mapper_dao/CompeteProjectConfigDao.xml
+++ b/mt/src/main/resources/mapper_dao/CompeteProjectConfigDao.xml
@@ -43,7 +43,8 @@
     where a.project_id = b.id
   </select>
   <select id="selectStartTime" resultType="com.ccsens.mt.bean.po.CompeteProjectConfig" parameterType="java.util.Map">
-    SELECT *
+    SELECT
+    project_id
     FROM  t_compete_project_config
     where project_id = #{projectId}
   </select>