From edca449b5fe9805b0465651c89a5adde1fc07e2e Mon Sep 17 00:00:00 2001
From: "Lihong@123456" <1090591095@qq.com>
Date: Mon, 16 Nov 2020 17:39:47 +0800
Subject: [PATCH] 11-13-3

---
 .../ccsens/mt/api/CompeteScoreController.java    |  2 +-
 .../java/com/ccsens/mt/bean/vo/CompeteVo.java    |  2 +-
 .../com/ccsens/mt/service/CompeteService.java    | 16 +++++++++-------
 mt/src/main/resources/application.yml            |  4 ++--
 4 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/mt/src/main/java/com/ccsens/mt/api/CompeteScoreController.java b/mt/src/main/java/com/ccsens/mt/api/CompeteScoreController.java
index 99fa955a..6bff8f81 100644
--- a/mt/src/main/java/com/ccsens/mt/api/CompeteScoreController.java
+++ b/mt/src/main/java/com/ccsens/mt/api/CompeteScoreController.java
@@ -52,7 +52,7 @@ public class CompeteScoreController {
         competeService.submitOrderList(params.getParam());
         return JsonResponse.newInstance().ok();
     }
-    @MustLogin
+
     @ApiOperation(value = "花样赛成绩查看", notes = "Mr.王 -----从花样赛成绩表里面查看出这个人得成绩")
     @RequestMapping(value = "/showResult", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"})
     public JsonResponse<List<CompeteVo.TotalScoreDisplay>> showResult (@ApiParam @Validated @RequestBody QueryDto<ScoreDto.ShowResult> params){
diff --git a/mt/src/main/java/com/ccsens/mt/bean/vo/CompeteVo.java b/mt/src/main/java/com/ccsens/mt/bean/vo/CompeteVo.java
index a84b0426..23b9a1dd 100644
--- a/mt/src/main/java/com/ccsens/mt/bean/vo/CompeteVo.java
+++ b/mt/src/main/java/com/ccsens/mt/bean/vo/CompeteVo.java
@@ -503,7 +503,7 @@ public class CompeteVo {
         private String  projectName;
         @ApiModelProperty("项目开始时间")
         private Long startTime;
-        @ApiModelProperty("项目状态")
+        @ApiModelProperty("项目状态0-未开始,1-进行中,2-结束")
         private int status;
     }
 
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..c31526e6 100644
--- a/mt/src/main/java/com/ccsens/mt/service/CompeteService.java
+++ b/mt/src/main/java/com/ccsens/mt/service/CompeteService.java
@@ -89,6 +89,12 @@ public class CompeteService implements ICompeteService {
     private CompeteStartOrderMapper competeStartOrderMapper;
     @Resource
     private CompeteVarietyScoreMapper competeVarietyScoreMapper;
+    @Resource
+    private CompeteProjectConfigDao competeProjectConfigDao;
+    @Resource
+    private  CompeteScoreDao competeScoreDao;
+    @Resource
+    private  CompeteCountScoreMapper competeCountScoreMapper;
 
     /**
      * 花样赛总成绩展示
@@ -183,11 +189,7 @@ public class CompeteService implements ICompeteService {
         return null;
     }
 
-    private CompeteProjectConfigDao competeProjectConfigDao;
-    @Resource
-    private  CompeteScoreDao competeScoreDao;
-    @Resource
-    private  CompeteCountScoreMapper competeCountScoreMapper;
+
 
     /**
      * 查看第几届
@@ -1155,12 +1157,12 @@ public class CompeteService implements ICompeteService {
                     //未开始0-未开始
                     countScore.setStatus(0);
                 }
-                if (currentTime > competeProjectConfig.getStartTime() && competeProjectConfig.getEndTime() > currentTime) {
+                if (currentTime >= competeProjectConfig.getStartTime() && competeProjectConfig.getEndTime() >= currentTime) {
                     //进行中1-进行中
                     countScore.setStatus(1);
                 }
                 if (competeProjectConfig.getEndTime() < currentTime) {
-                    //已经结束-结束
+                    //已经结束2-结束
                     countScore.setStatus(2);
                 }
                 countScoreList.add(countScore);
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