20201118v1.0

mt/src/main/java/com/ccsens/mt/bean/dto/ProvinceCompeteDto.java

@@ -4,6 +4,7 @@ import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import javax.validation.constraints.NotEmpty;
 import javax.validation.constraints.NotNull;
 import java.util.Date;
 import java.util.List;
@@ -282,6 +283,7 @@ public class ProvinceCompeteDto {
         private int judgmentNum;
         @ApiModelProperty("姓名")
         private String judgmentName;
+        @NotEmpty
         @ApiModelProperty("手机号")
         private String judgmentPhone;
         @ApiModelProperty("备注")

mt/src/main/java/com/ccsens/mt/bean/vo/ProvinceCompeteVo.java

@@ -285,6 +285,8 @@ public class ProvinceCompeteVo {
         private Long projectId;
         @ApiModelProperty("项目名")
         private String projectName;
+        @ApiModelProperty("比赛类型 0计数赛 1花样赛")
+        private int projectType;
         @ApiModelProperty("项目开始时间")
         private Long startTime;
         @ApiModelProperty("项目结束时间")

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

@@ -257,7 +257,7 @@ public class CompeteTaskService implements ICompeteTaskService{
                                 addTask.setTaskName(project.getName() + competeOrder +"-" + site);
                                 addTask.setBeginTime(projectStartTime);
                                 addTask.setEndTime(projectStartTime + orderTime);
-                                addTask.setExecutorId(1L);
+                                addTask.setExecutorId(tallRoleId);
                                 addTask.setToken(token);
                                 log.info("在tall内添加任务：{}",addTask);
                                 JsonResponse<TaskVo.NormalTask> normalTaskJsonResponse = tallFeignClient.saveTask(addTask);
@@ -308,7 +308,33 @@ public class CompeteTaskService implements ICompeteTaskService{
      */
     @Override
     public List<ProvinceCompeteVo.QueryJudgment> queryJudgment(CompeteDto.CompeteTime param) {
-        return competeJudgmentDao.queryJudgment(param.getCompeteTimeId());
+        List<ProvinceCompeteVo.QueryJudgment> queryJudgmentList = competeJudgmentDao.queryJudgment(param.getCompeteTimeId());
+        if(CollectionUtil.isNotEmpty(queryJudgmentList)){
+            queryJudgmentList.forEach(projectJudgment -> {
+                //裁判数量
+                int count = 0;
+
+                if(CollectionUtil.isNotEmpty(projectJudgment.getSiteList())){
+                    for(ProvinceCompeteVo.ProjectSite siteJudgment : projectJudgment.getSiteList()) {
+                        if(projectJudgment.getProjectType() == 0){
+                            count = 3;
+                        }else {
+                            count = 7;
+                        }
+                        if (CollectionUtil.isEmpty(siteJudgment.getJudgmentList())) {
+                            siteJudgment.setJudgmentList(new ArrayList<>());
+                        }
+                        int a = siteJudgment.getJudgmentList().size();
+                        for (int i = 0; i < count - a; i++) {
+                            ProvinceCompeteVo.SiteJudgment siteJudgment1 = new ProvinceCompeteVo.SiteJudgment();
+                            siteJudgment1.setJudgmentNum(a + i);
+                            siteJudgment.getJudgmentList().add(siteJudgment1);
+                        }
+                    }
+                }
+            });
+        }
+        return queryJudgmentList;
     }
 
     /**

mt/src/main/java/com/ccsens/mt/util/Constant.java

@@ -46,6 +46,14 @@ public class Constant {
      * 速度通级赛id
      */
     public static final long CERTIFICATE = 2018;
+    /**
+     * 计数赛id
+     */
+    public static final long COMPETE_COUNT = 2001;
+    /**
+     * 花样赛
+     */
+    public static final long COMPETE_VARIETY = 2002;
     /**
      * 每个比赛项目留给选手上传视频的时间(暂定半个小时，可以修改)
      */

mt/src/main/resources/application.yml

@@ -1,5 +1,5 @@
 spring:
   profiles:
-    active: dev
+    active: test
-    include: common, util-dev
+    include: common, util-test
 

mt/src/main/resources/mapper_dao/CompeteJudgmentDao.xml

@@ -5,6 +5,7 @@
     <resultMap id="queryJudgment" type="com.ccsens.mt.bean.vo.ProvinceCompeteVo$QueryJudgment">
         <id column="projectId" property="projectId"/>
         <result column="projectName" property="projectName"/>
+        <result column="projectType" property="projectType"/>
         <result column="startTime" property="startTime"/>
         <result column="endTime" property="endTime"/>
         <collection property="siteList" ofType="com.ccsens.mt.bean.vo.ProvinceCompeteVo$ProjectSite">
@@ -28,7 +29,8 @@
         j.chief_judgment as judgmentNum,
         j.`name` as judgmentName,
         j.phone as judgmentPhone,
-        j.remark as remark
+        j.remark as remark,
+        if(p.parent_id = 2001,0,1) as projectType
         FROM
         t_compete_project p LEFT JOIN t_compete_time ct on p.type = ct.type
         LEFT JOIN t_compete_project_config pc on p.id = pc.project_id
@@ -36,6 +38,7 @@
         WHERE
         ct.id = #{competeTimeId}
         and p.`level` = 2
+        and p.certificate = 0
         and p.rec_status = 0
         and (j.rec_status = 0 or j.rec_status is null)
     </select>

tall/src/main/java/com/ccsens/tall/web/TaskController.java

@@ -228,6 +228,7 @@ public class TaskController {
         Long currentUserId =  Long.valueOf(((Claims) request.getAttribute(WebConstant.REQUEST_KEY_CLAIMS)).getSubject());
         log.info("新加任务，userId：{}、任务信息：{}",currentUserId,addTask);
         TaskVo.NormalTask normalTask = subTimeService.addTask(currentUserId,addTask);
+        log.info("添加的任务的信息：{}",normalTask);
         return JsonResponse.newInstance().ok(normalTask);
     }
 

tall/src/main/resources/application.yml

@@ -1,5 +1,5 @@
 spring:
   profiles:
-    active: test
+    active: dev
-    include: util-test,common
+    include: util-dev,common