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

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){

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;
     }
 

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

@@ -1161,12 +1161,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);

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

@@ -68,6 +68,9 @@ public class CompeteVedioService implements ICompeteVedioService{
         competeVideo.setProjectId(param.getCompeteProjectId());
         competeVideo.setPlayerId(param.getPlayerOrTeamId());
         competeVideo.setVideoUrl(param.getVideoPath());
+        competeVideo.setRecStatus((byte) 0);
+        long startTime = System.currentTimeMillis();
+        competeVideo.setUploadTime(startTime);
         competeVideoMapper.insert(competeVideo);
         return param.getVideoPath();
     }