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

mt/src/main/java/com/ccsens/mt/api/CompeteVideoController.java

@@ -82,7 +82,6 @@ public class CompeteVideoController {
         log.info("添加用户观看开幕式视频记录（签到用）:{}",params);
         List<VideoProjectVo.GetTwoProject> list=iCompeteVedioService.selectTwoProject(params);
         return JsonResponse.newInstance().ok(list);
-
     }
     @MustLogin
     @ApiOperation(value = "查找所有参赛单位", notes = "Mr.王---------去那个competeProject表下面查")

mt/src/main/java/com/ccsens/mt/bean/po/CompeteProjectConfig.java

@@ -8,6 +8,8 @@ public class CompeteProjectConfig implements Serializable {
 
     private Long projectId;
 
+    private Long projectDuration;
+
     private Integer siteNum;
 
     private Long startTime;
@@ -20,7 +22,11 @@ public class CompeteProjectConfig implements Serializable {
 
     private Byte recStatus;
 
-    private Long projectDuration;
+    private Long videoStartTime;
+
+    private Long videoEndTime;
+
+    private Byte restrict;
 
     private static final long serialVersionUID = 1L;
 
@@ -40,6 +46,14 @@ public class CompeteProjectConfig implements Serializable {
         this.projectId = projectId;
     }
 
+    public Long getProjectDuration() {
+        return projectDuration;
+    }
+
+    public void setProjectDuration(Long projectDuration) {
+        this.projectDuration = projectDuration;
+    }
+
     public Integer getSiteNum() {
         return siteNum;
     }
@@ -88,12 +102,28 @@ public class CompeteProjectConfig implements Serializable {
         this.recStatus = recStatus;
     }
 
-    public Long getProjectDuration() {
+    public Long getVideoStartTime() {
-        return projectDuration;
+        return videoStartTime;
     }
 
-    public void setProjectDuration(Long projectDuration) {
+    public void setVideoStartTime(Long videoStartTime) {
-        this.projectDuration = projectDuration;
+        this.videoStartTime = videoStartTime;
+    }
+
+    public Long getVideoEndTime() {
+        return videoEndTime;
+    }
+
+    public void setVideoEndTime(Long videoEndTime) {
+        this.videoEndTime = videoEndTime;
+    }
+
+    public Byte getRestrict() {
+        return restrict;
+    }
+
+    public void setRestrict(Byte restrict) {
+        this.restrict = restrict;
     }
 
     @Override
@@ -104,13 +134,16 @@ public class CompeteProjectConfig implements Serializable {
         sb.append("Hash = ").append(hashCode());
         sb.append(", id=").append(id);
         sb.append(", projectId=").append(projectId);
+        sb.append(", projectDuration=").append(projectDuration);
         sb.append(", siteNum=").append(siteNum);
         sb.append(", startTime=").append(startTime);
         sb.append(", endTime=").append(endTime);
         sb.append(", createdAt=").append(createdAt);
         sb.append(", updatedAt=").append(updatedAt);
         sb.append(", recStatus=").append(recStatus);
-        sb.append(", projectDuration=").append(projectDuration);
+        sb.append(", videoStartTime=").append(videoStartTime);
+        sb.append(", videoEndTime=").append(videoEndTime);
+        sb.append(", restrict=").append(restrict);
         sb.append("]");
         return sb.toString();
     }

mt/src/main/java/com/ccsens/mt/bean/po/CompeteProjectConfigExample.java

@@ -225,6 +225,66 @@ public class CompeteProjectConfigExample {
             return (Criteria) this;
         }
 
+        public Criteria andProjectDurationIsNull() {
+            addCriterion("project_duration is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andProjectDurationIsNotNull() {
+            addCriterion("project_duration is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andProjectDurationEqualTo(Long value) {
+            addCriterion("project_duration =", value, "projectDuration");
+            return (Criteria) this;
+        }
+
+        public Criteria andProjectDurationNotEqualTo(Long value) {
+            addCriterion("project_duration <>", value, "projectDuration");
+            return (Criteria) this;
+        }
+
+        public Criteria andProjectDurationGreaterThan(Long value) {
+            addCriterion("project_duration >", value, "projectDuration");
+            return (Criteria) this;
+        }
+
+        public Criteria andProjectDurationGreaterThanOrEqualTo(Long value) {
+            addCriterion("project_duration >=", value, "projectDuration");
+            return (Criteria) this;
+        }
+
+        public Criteria andProjectDurationLessThan(Long value) {
+            addCriterion("project_duration <", value, "projectDuration");
+            return (Criteria) this;
+        }
+
+        public Criteria andProjectDurationLessThanOrEqualTo(Long value) {
+            addCriterion("project_duration <=", value, "projectDuration");
+            return (Criteria) this;
+        }
+
+        public Criteria andProjectDurationIn(List<Long> values) {
+            addCriterion("project_duration in", values, "projectDuration");
+            return (Criteria) this;
+        }
+
+        public Criteria andProjectDurationNotIn(List<Long> values) {
+            addCriterion("project_duration not in", values, "projectDuration");
+            return (Criteria) this;
+        }
+
+        public Criteria andProjectDurationBetween(Long value1, Long value2) {
+            addCriterion("project_duration between", value1, value2, "projectDuration");
+            return (Criteria) this;
+        }
+
+        public Criteria andProjectDurationNotBetween(Long value1, Long value2) {
+            addCriterion("project_duration not between", value1, value2, "projectDuration");
+            return (Criteria) this;
+        }
+
         public Criteria andSiteNumIsNull() {
             addCriterion("site_num is null");
             return (Criteria) this;
@@ -585,63 +645,183 @@ public class CompeteProjectConfigExample {
             return (Criteria) this;
         }
 
-        public Criteria andProjectDurationIsNull() {
+        public Criteria andVideoStartTimeIsNull() {
-            addCriterion("project_duration is null");
+            addCriterion("video_start_time is null");
             return (Criteria) this;
         }
 
-        public Criteria andProjectDurationIsNotNull() {
+        public Criteria andVideoStartTimeIsNotNull() {
-            addCriterion("project_duration is not null");
+            addCriterion("video_start_time is not null");
             return (Criteria) this;
         }
 
-        public Criteria andProjectDurationEqualTo(Long value) {
+        public Criteria andVideoStartTimeEqualTo(Long value) {
-            addCriterion("project_duration =", value, "projectDuration");
+            addCriterion("video_start_time =", value, "videoStartTime");
             return (Criteria) this;
         }
 
-        public Criteria andProjectDurationNotEqualTo(Long value) {
+        public Criteria andVideoStartTimeNotEqualTo(Long value) {
-            addCriterion("project_duration <>", value, "projectDuration");
+            addCriterion("video_start_time <>", value, "videoStartTime");
             return (Criteria) this;
         }
 
-        public Criteria andProjectDurationGreaterThan(Long value) {
+        public Criteria andVideoStartTimeGreaterThan(Long value) {
-            addCriterion("project_duration >", value, "projectDuration");
+            addCriterion("video_start_time >", value, "videoStartTime");
             return (Criteria) this;
         }
 
-        public Criteria andProjectDurationGreaterThanOrEqualTo(Long value) {
+        public Criteria andVideoStartTimeGreaterThanOrEqualTo(Long value) {
-            addCriterion("project_duration >=", value, "projectDuration");
+            addCriterion("video_start_time >=", value, "videoStartTime");
             return (Criteria) this;
         }
 
-        public Criteria andProjectDurationLessThan(Long value) {
+        public Criteria andVideoStartTimeLessThan(Long value) {
-            addCriterion("project_duration <", value, "projectDuration");
+            addCriterion("video_start_time <", value, "videoStartTime");
             return (Criteria) this;
         }
 
-        public Criteria andProjectDurationLessThanOrEqualTo(Long value) {
+        public Criteria andVideoStartTimeLessThanOrEqualTo(Long value) {
-            addCriterion("project_duration <=", value, "projectDuration");
+            addCriterion("video_start_time <=", value, "videoStartTime");
             return (Criteria) this;
         }
 
-        public Criteria andProjectDurationIn(List<Long> values) {
+        public Criteria andVideoStartTimeIn(List<Long> values) {
-            addCriterion("project_duration in", values, "projectDuration");
+            addCriterion("video_start_time in", values, "videoStartTime");
             return (Criteria) this;
         }
 
-        public Criteria andProjectDurationNotIn(List<Long> values) {
+        public Criteria andVideoStartTimeNotIn(List<Long> values) {
-            addCriterion("project_duration not in", values, "projectDuration");
+            addCriterion("video_start_time not in", values, "videoStartTime");
             return (Criteria) this;
         }
 
-        public Criteria andProjectDurationBetween(Long value1, Long value2) {
+        public Criteria andVideoStartTimeBetween(Long value1, Long value2) {
-            addCriterion("project_duration between", value1, value2, "projectDuration");
+            addCriterion("video_start_time between", value1, value2, "videoStartTime");
             return (Criteria) this;
         }
 
-        public Criteria andProjectDurationNotBetween(Long value1, Long value2) {
+        public Criteria andVideoStartTimeNotBetween(Long value1, Long value2) {
-            addCriterion("project_duration not between", value1, value2, "projectDuration");
+            addCriterion("video_start_time not between", value1, value2, "videoStartTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andVideoEndTimeIsNull() {
+            addCriterion("video_end_time is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andVideoEndTimeIsNotNull() {
+            addCriterion("video_end_time is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andVideoEndTimeEqualTo(Long value) {
+            addCriterion("video_end_time =", value, "videoEndTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andVideoEndTimeNotEqualTo(Long value) {
+            addCriterion("video_end_time <>", value, "videoEndTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andVideoEndTimeGreaterThan(Long value) {
+            addCriterion("video_end_time >", value, "videoEndTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andVideoEndTimeGreaterThanOrEqualTo(Long value) {
+            addCriterion("video_end_time >=", value, "videoEndTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andVideoEndTimeLessThan(Long value) {
+            addCriterion("video_end_time <", value, "videoEndTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andVideoEndTimeLessThanOrEqualTo(Long value) {
+            addCriterion("video_end_time <=", value, "videoEndTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andVideoEndTimeIn(List<Long> values) {
+            addCriterion("video_end_time in", values, "videoEndTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andVideoEndTimeNotIn(List<Long> values) {
+            addCriterion("video_end_time not in", values, "videoEndTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andVideoEndTimeBetween(Long value1, Long value2) {
+            addCriterion("video_end_time between", value1, value2, "videoEndTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andVideoEndTimeNotBetween(Long value1, Long value2) {
+            addCriterion("video_end_time not between", value1, value2, "videoEndTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andRestrictIsNull() {
+            addCriterion("restrict is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andRestrictIsNotNull() {
+            addCriterion("restrict is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andRestrictEqualTo(Byte value) {
+            addCriterion("restrict =", value, "restrict");
+            return (Criteria) this;
+        }
+
+        public Criteria andRestrictNotEqualTo(Byte value) {
+            addCriterion("restrict <>", value, "restrict");
+            return (Criteria) this;
+        }
+
+        public Criteria andRestrictGreaterThan(Byte value) {
+            addCriterion("restrict >", value, "restrict");
+            return (Criteria) this;
+        }
+
+        public Criteria andRestrictGreaterThanOrEqualTo(Byte value) {
+            addCriterion("restrict >=", value, "restrict");
+            return (Criteria) this;
+        }
+
+        public Criteria andRestrictLessThan(Byte value) {
+            addCriterion("restrict <", value, "restrict");
+            return (Criteria) this;
+        }
+
+        public Criteria andRestrictLessThanOrEqualTo(Byte value) {
+            addCriterion("restrict <=", value, "restrict");
+            return (Criteria) this;
+        }
+
+        public Criteria andRestrictIn(List<Byte> values) {
+            addCriterion("restrict in", values, "restrict");
+            return (Criteria) this;
+        }
+
+        public Criteria andRestrictNotIn(List<Byte> values) {
+            addCriterion("restrict not in", values, "restrict");
+            return (Criteria) this;
+        }
+
+        public Criteria andRestrictBetween(Byte value1, Byte value2) {
+            addCriterion("restrict between", value1, value2, "restrict");
+            return (Criteria) this;
+        }
+
+        public Criteria andRestrictNotBetween(Byte value1, Byte value2) {
+            addCriterion("restrict not between", value1, value2, "restrict");
             return (Criteria) this;
         }
     }

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

@@ -80,6 +80,8 @@ public class CompeteExcelVo {
         private String projectName;
         @ApiModelProperty("时间")
         private String startTime;
+        @ApiModelProperty("是否不限组别")
+        private int joinRule;
         @ApiModelProperty("项目信息")
         private List<TeamOrderPlayer> projectList;
     }

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

@@ -549,6 +549,8 @@ public class CompeteVo {
 
         @ApiModelProperty("姓名")
         private String name;
+        @ApiModelProperty("场次")
+        private Byte competeOrder;
         @ApiModelProperty("场地信息")
         private Byte site;
         @ApiModelProperty("备注")

mt/src/main/java/com/ccsens/mt/persist/dao/CompeteScoreDao.java

@@ -1,12 +1,8 @@
 package com.ccsens.mt.persist.dao;
 
-import com.ccsens.mt.bean.po.CompeteCoach;
-import com.ccsens.mt.bean.po.CompeteCompany;
 import com.ccsens.mt.bean.vo.CompeteExcelVo;
 import com.ccsens.mt.bean.vo.CompeteVo;
-import com.ccsens.mt.bean.vo.ProvinceCompeteVo;
 import com.ccsens.mt.bean.vo.ScoreVo;
-import com.ccsens.mt.persist.mapper.CompeteCompanyMapper;
 import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Repository;
 
@@ -93,9 +89,10 @@ public interface CompeteScoreDao  {
     /**
      * 统计花样赛成绩
      * @param projectId 项目ID
+     * @param page 第几条
      * @return 成绩
      */
-    List<CompeteVo.TotalScoreDisplay> queryVarietyScore(@Param("projectId") Long projectId);
+    List<CompeteVo.TotalScoreDisplay> queryVarietyScore(@Param("projectId") Long projectId, @Param("page") int page);
 
     /**
      * 查询花样赛某一场的成绩
@@ -118,4 +115,11 @@ public interface CompeteScoreDao  {
      * @return
      */
     List<CompeteExcelVo.Project> selAllOrder(@Param("type") byte type);
+
+    /**
+     * 查找计数赛分数
+     * @param siteId
+     * @return
+     */
+    ScoreVo.CountScoreCurrentSite getCountScoreByOrderId(@Param("siteId")Long siteId);
 }

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

@@ -214,7 +214,7 @@ public class CompeteService implements ICompeteService {
     @Override
     public PageInfo<CompeteVo.TotalScoreDisplay> showResult(ScoreDto.ShowResultW param) {
         PageHelper.startPage(param.getPageNum(), param.getPageSize());
-        List<CompeteVo.TotalScoreDisplay> list =  competeScoreDao.queryVarietyScore(param.getProjectId());
+        List<CompeteVo.TotalScoreDisplay> list =  competeScoreDao.queryVarietyScore(param.getProjectId(), (param.getPageNum()-1)*param.getPageSize() );
         return new PageInfo<>(list);
     }
 //    public List<CompeteVo.TotalScoreDisplay> showResult(ScoreDto.ShowResultW param) {
@@ -1422,19 +1422,24 @@ public class CompeteService implements ICompeteService {
     @Override
     public List<ScoreVo.CountScoreCurrentSite> countScoreCurrentSite(CompeteDto.CompeteSite params) {
         Long siteId = params.getSiteId();
-        List<ScoreVo.CountScoreCurrentSite> countScoreCurrentSites = competeScoreDao.selectCountScoreCurrentSite(siteId);
+        List<ScoreVo.CountScoreCurrentSite> scoreCurrentSiteList = new ArrayList<>();
-        countScoreCurrentSites.forEach(mes->{
+        ScoreVo.CountScoreCurrentSite countScoreCurrentSite = competeScoreDao.getCountScoreByOrderId(siteId);
-            CompeteStartOrder competeStartOrder = competeStartOrderMapper.selectByPrimaryKey(siteId);
+        scoreCurrentSiteList.add(countScoreCurrentSite);
-            CompeteVideoExample competeVideoExample = new CompeteVideoExample();
+
-            competeVideoExample.createCriteria().andProjectIdEqualTo(competeStartOrder.getProjectId()).andPlayerIdEqualTo(competeStartOrder.getPlayerId());
+
-            List<CompeteVideo> competeVideos = competeVideoMapper.selectByExample(competeVideoExample);
+//        List<ScoreVo.CountScoreCurrentSite> countScoreCurrentSites = competeScoreDao.selectCountScoreCurrentSite(siteId);
-            if(competeVideos.size()>0) {
+//        countScoreCurrentSites.forEach(mes->{
-                CompeteVideo competeVideo = competeVideos.get(0);
+//            CompeteStartOrder competeStartOrder = competeStartOrderMapper.selectByPrimaryKey(siteId);
-                String path = competeVideo.getVideoUrl();
+//            CompeteVideoExample competeVideoExample = new CompeteVideoExample();
-                mes.setVideoUrl(path);
+//            competeVideoExample.createCriteria().andProjectIdEqualTo(competeStartOrder.getProjectId()).andPlayerIdEqualTo(competeStartOrder.getPlayerId());
-            }
+//            List<CompeteVideo> competeVideos = competeVideoMapper.selectByExample(competeVideoExample);
-        });
+//            if(competeVideos.size()>0) {
-        return countScoreCurrentSites;
+//                CompeteVideo competeVideo = competeVideos.get(0);
+//                String path = competeVideo.getVideoUrl();
+//                mes.setVideoUrl(path);
+//            }
+//        });
+        return scoreCurrentSiteList;
     }
 
     @Override
@@ -1745,6 +1750,8 @@ public class CompeteService implements ICompeteService {
             }
 
         }
+        //场次信息
+        selScropeVo.setCompeteOrder(competeStartOrder1.getCompeteOrder());
         //场地信息
         selScropeVo.setSite(competeStartOrder1.getSite());
 

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

@@ -525,6 +525,7 @@ public class CompeteTaskService implements ICompeteTaskService {
             if(memberJsonResponse.getCode() == 200){
                 MemberVo.Member member = memberJsonResponse.getData();
                 if(ObjectUtil.isNotNull(member)){
+                    memberId = member.getMemberId();
                     userId = member.getUserId();
                 }
             }
@@ -551,6 +552,7 @@ public class CompeteTaskService implements ICompeteTaskService {
 
                 MemberVo.MemberList memberList = memberListJsonResponse.getData();
                 if (ObjectUtil.isNotNull(memberList)) {
+
                     memberId = memberList.getMemberId();
                     userId = memberList.getUserId();
                 }
@@ -636,6 +638,7 @@ public class CompeteTaskService implements ICompeteTaskService {
             competeJudgment.setRoleId(roleId);
             competeJudgment.setMemberId(memberId);
             competeJudgment.setUserId(userId);
+            log.info("添加教练信息：{}",competeJudgment);
             competeJudgmentDao.insertSelective(competeJudgment);
 
         }

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

@@ -22,7 +22,6 @@ import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
 import lombok.extern.slf4j.Slf4j;
 
-import org.apache.poi.ss.usermodel.Table;
 import org.apache.poi.ss.usermodel.Workbook;
 import org.apache.poi.xssf.usermodel.XSSFWorkbook;
 import org.eclipse.jetty.util.StringUtil;
@@ -38,9 +37,7 @@ import java.io.OutputStream;
 import java.text.SimpleDateFormat;
 
 import java.util.ArrayList;
-import java.util.Comparator;
 import java.util.Date;
-import java.util.LinkedList;
 import java.util.List;
 
 @Slf4j
@@ -649,20 +646,31 @@ public class ExcelService implements IExcelService {
                         List<PoiUtil.PoiUtilCell> three = new ArrayList<>();
                         PoiUtil.PoiUtilCell three1;
                         PoiUtil.PoiUtilCell three2;
+                        PoiUtil.PoiUtilCell three3 = null;
                         if (q == 0) {
                             three1 = new PoiUtil.PoiUtilCell(project.getStartTime(), 1, j);
                             three2 = new PoiUtil.PoiUtilCell(project.getProjectName(), 1, j);
+                            if(project.getJoinRule() == 1) {
+                                three3 = new PoiUtil.PoiUtilCell("不限组别", 1, j);
+                            }
                             q++;
+
                         } else {
                             three1 = new PoiUtil.PoiUtilCell();
                             three2 = new PoiUtil.PoiUtilCell();
+                            if(project.getJoinRule() == 1) {
+                                three3 = new PoiUtil.PoiUtilCell();
+                            }
                         }
-                        PoiUtil.PoiUtilCell three3;
+//                        PoiUtil.PoiUtilCell three3 = null;
-                        if (t == 0) {
+                        if(project.getJoinRule() == 0) {
-                            three3 = new PoiUtil.PoiUtilCell(project.getProjectList().get(k).getGroupName(), 1, project.getProjectList().get(k).getCompanyNameList().size());
+                            if (t == 0) {
-                            ++t;
+                                    three3 = new PoiUtil.PoiUtilCell(project.getProjectList().get(k).getGroupName(), 1, project.getProjectList().get(k).getCompanyNameList().size());
-                        } else {
+                                    ++t;
-                            three3 = new PoiUtil.PoiUtilCell();
+
+                            } else {
+                                three3 = new PoiUtil.PoiUtilCell();
+                            }
                         }
                         PoiUtil.PoiUtilCell three4 = new PoiUtil.PoiUtilCell(project.getProjectList().get(k).getCompanyNameList().get(m).getStartOrder(), 1, 1);
                         PoiUtil.PoiUtilCell three5 = new PoiUtil.PoiUtilCell(project.getProjectList().get(k).getCompanyNameList().get(m).getCompanyName(), 1, 1);
@@ -1251,7 +1259,7 @@ public class ExcelService implements IExcelService {
     @Override
     public String patternExpTable(ScoreDto.ShowResultNoPage param) {
         //List<CompeteVo.TotalScoreDisplay> totalScoreDisplays = competeService.showResultPage(param);
-        List<CompeteVo.TotalScoreDisplay> totalScoreDisplays =  competeScoreDao.queryVarietyScore(param.getProjectId());
+        List<CompeteVo.TotalScoreDisplay> totalScoreDisplays =  competeScoreDao.queryVarietyScore(param.getProjectId(), 0);
         List<List<PoiUtil.PoiUtilCell>> list = new ArrayList<>();
         List<PoiUtil.PoiUtilCell> zero=new ArrayList<>();
         PoiUtil.PoiUtilCell zeroOne=new PoiUtil.PoiUtilCell("比赛成绩公示(花样赛)", 14, 1);

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

@@ -16,7 +16,9 @@
     <resultMap id="startOrderByCompany" type="com.ccsens.mt.bean.vo.ProvinceCompeteVo$StartOrderByCompanyAndProject">
         <id column="projectId" property="projectId" />
         <result column="projectName" property="projectName" />
+        <result column="startTime" property="startTime" />
         <result column="endTime" property="endTime" />
+        <result column="videoRestrict" property="restrict" />
         <collection property="startOrderList" ofType="com.ccsens.mt.bean.vo.ProvinceCompeteVo$StartOrder">
             <id column="startOrderId"  property="startOrderId" />
             <result column="competeOrder" property="competeOrder" />
@@ -336,7 +338,9 @@
       so.id as startOrderId,
       so.compete_order as competeOrder,
       so.site as site,
-      pc.start_time as endTime,
+      pc.video_start_time as startTime,
+      pc.video_end_time as endTime,
+      pc.video_restrict as videoRestrict,
       pr.id as projectId,
       pr.`name` as projectName,
       pr.`team` as team,

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

@@ -92,7 +92,7 @@
         cs.final_score as finalScore
     FROM
     t_compete_start_order so
-    LEFT JOIN t_compete_count_score  cs on cs.site_order_id = so.id
+    LEFT JOIN t_compete_count_score  cs on cs.site_order_id = so.id and cs.rec_status = 0
     LEFT JOIN t_compete_project cp on so.project_id = cp.id
     LEFT JOIN t_compete_project_player pp on so.player_id = pp.id
     LEFT JOIN t_compete_player p on pp.player_id = p.id
@@ -100,7 +100,6 @@
     LEFT JOIN t_compete_company c on p.company_id = c.id
     WHERE
     so.id = #{siteId}
-      and cs.rec_status = 0
     and so.rec_status = 0
     and cp.rec_status = 0
     and pp.rec_status = 0
@@ -726,7 +725,7 @@
         group by s.site_order_id
         order by result desc
         	)t,
-	(SELECT @rownum := 0)t1
+	(SELECT @rownum := ${page})t1
     </select>
     <select id="selAllDaiBiaoDui" resultType="com.ccsens.mt.bean.vo.CompeteVo$DaiBiaoDUi">
             select q.*,identity,GROUP_CONCAT(tcch.name) as name  From
@@ -894,6 +893,7 @@
         <id column="projectId" property="projectId"></id>
         <result column="projectName" property="projectName" />
         <result property="startTime" column="startTime" />
+        <result property="joinRule" column="joinRule" />
         <collection property="projectList" column="groupId" ofType="com.ccsens.mt.bean.vo.CompeteExcelVo$TeamOrderPlayer">
             <id property="groupId" column="groupId"/>
             <result property="groupName" column="groupName"/>
@@ -911,8 +911,9 @@
     FROM
         (
     SELECT
-        CONCAT( FROM_UNIXTIME( pc.start_time / 1000, '%Y-%m-%d %H:%i' ), '~', FROM_UNIXTIME( pc.end_time / 1000, '%H:%i' ) ) AS startTime,
+        CONCAT( FROM_UNIXTIME( pc.video_start_time / 1000, '%Y-%m-%d %H:%i' ), '~', FROM_UNIXTIME( pc.video_end_time / 1000, '%H:%i' ) ) AS startTime,
         p.`name` AS projectName,
+        p.`join_rule` AS joinRule,
         g.`group_name` AS groupName,
         CONCAT( so.compete_order, '--', so.site ) AS startOrder,
         c.`name` AS companyName,
@@ -946,8 +947,9 @@
         AND pc.rec_status = 0
         AND so.rec_status = 0 UNION
     SELECT
-        CONCAT( FROM_UNIXTIME( pc.start_time / 1000, '%Y-%m-%d %H:%i' ), '~', FROM_UNIXTIME( pc.end_time / 1000, '%H:%i' ) ) AS startTime,
+        CONCAT( FROM_UNIXTIME( pc.video_start_time / 1000, '%Y-%m-%d %H:%i' ), '~', FROM_UNIXTIME( pc.video_end_time / 1000, '%H:%i' ) ) AS startTime,
         p.`name` AS projectName,
+        p.`join_rule` AS joinRule,
         g.`group_name` AS groupName,
         CONCAT( so.compete_order, '--', so.site ) AS startOrder,
         c.`name` AS companyName,
@@ -999,6 +1001,73 @@
         t.competeOrder,
         t.site
 
+    </select>
+    <select id="getCountScoreByOrderId" resultType="com.ccsens.mt.bean.vo.ScoreVo$CountScoreCurrentSite">
+         SELECT
+                so.id,
+                        so.player_id,
+                cp.`name` as projectName,
+                so.site as site,
+                so.compete_order as competeOrder,
+                cs.chief_judgment_score as mainScore,
+                cs.judgment_a_score as mainOneScore,
+                cs.judgment_b_score2 as mainTwoScore,
+                cs.should_times as shouldScore,
+                cs.deduct_times as deductTime,
+                cs.deduct_cause as deductReason,
+                cs.final_score as finalScore,
+                        v.video_url,
+                        t.*
+            FROM
+            t_compete_start_order so
+            LEFT JOIN t_compete_count_score  cs on cs.site_order_id = so.id
+                and cs.rec_status = 0
+            LEFT JOIN t_compete_project cp on so.project_id = cp.id
+                LEFT JOIN t_compete_video v on so.player_id = v.player_id and v.rec_status = 0
+                LEFT JOIN(
+
+        SELECT
+        pp.id as playerId,
+        p.`name` as  `name`,
+        c.`name` as companyName,
+        g.group_name as groupName
+        FROM
+        t_compete_project_player pp
+        LEFT JOIN t_compete_player p on pp.player_id = p.id
+        LEFT JOIN t_compete_company c on c.id = p.company_id
+        LEFT JOIN t_compete_group g on p.compete_group_id = g.id
+        WHERE
+        pp.rec_status = 0
+        and p.rec_status = 0
+        and c.rec_status = 0
+        and g.rec_status = 0
+        UNION
+
+        SELECT
+        t.id as playerId,
+        GROUP_CONCAT(p.`name` separator '、') as  `name`,
+        c.`name` as companyName,
+        g.group_name as groupName
+        FROM
+        t_compete_team t
+        LEFT JOIN t_compete_team_member m on m.compete_team_id = t.id
+        LEFT JOIN t_compete_player p on m.player_id = p.id
+        LEFT JOIN t_compete_company c on c.id = p.company_id
+        LEFT JOIN t_compete_group g on t.gender_group = g.sex and t.group_remark = g.group_remark
+        WHERE
+        t.rec_status = 0
+        and m.rec_status = 0
+        and p.rec_status = 0
+        and c.rec_status = 0
+        and g.rec_status = 0
+        GROUP BY t.id
+
+        )t on t.playerId = so.player_id
+            WHERE
+            so.id = #{siteId}
+            and so.rec_status = 0
+            and cp.rec_status = 0
+
     </select>
 
     <!--<select id="queryEightGroupLimit" resultType="com.ccsens.mt.bean.vo.CompeteExcelVo$BeforeEight">

mt/src/main/resources/mapper_raw/CompeteProjectConfigMapper.xml

@@ -4,13 +4,16 @@
   <resultMap id="BaseResultMap" type="com.ccsens.mt.bean.po.CompeteProjectConfig">
     <id column="id" jdbcType="BIGINT" property="id" />
     <result column="project_id" jdbcType="BIGINT" property="projectId" />
+    <result column="project_duration" jdbcType="BIGINT" property="projectDuration" />
     <result column="site_num" jdbcType="INTEGER" property="siteNum" />
     <result column="start_time" jdbcType="BIGINT" property="startTime" />
     <result column="end_time" jdbcType="BIGINT" property="endTime" />
     <result column="created_at" jdbcType="TIMESTAMP" property="createdAt" />
     <result column="updated_at" jdbcType="TIMESTAMP" property="updatedAt" />
     <result column="rec_status" jdbcType="TINYINT" property="recStatus" />
-    <result column="project_duration" jdbcType="BIGINT" property="projectDuration" />
+    <result column="video_start_time" jdbcType="BIGINT" property="videoStartTime" />
+    <result column="video_end_time" jdbcType="BIGINT" property="videoEndTime" />
+    <result column="restrict" jdbcType="TINYINT" property="restrict" />
   </resultMap>
   <sql id="Example_Where_Clause">
     <where>
@@ -71,8 +74,8 @@
     </where>
   </sql>
   <sql id="Base_Column_List">
-    id, project_id, site_num, start_time, end_time, created_at, updated_at, rec_status, 
+    id, project_id, project_duration, site_num, start_time, end_time, created_at, updated_at, 
-    project_duration
+    rec_status, video_start_time, video_end_time, restrict
   </sql>
   <select id="selectByExample" parameterType="com.ccsens.mt.bean.po.CompeteProjectConfigExample" resultMap="BaseResultMap">
     select
@@ -105,13 +108,15 @@
     </if>
   </delete>
   <insert id="insert" parameterType="com.ccsens.mt.bean.po.CompeteProjectConfig">
-    insert into t_compete_project_config (id, project_id, site_num, 
+    insert into t_compete_project_config (id, project_id, project_duration, 
-      start_time, end_time, created_at, 
+      site_num, start_time, end_time, 
-      updated_at, rec_status, project_duration
+      created_at, updated_at, rec_status, 
+      video_start_time, video_end_time, restrict
       )
-    values (#{id,jdbcType=BIGINT}, #{projectId,jdbcType=BIGINT}, #{siteNum,jdbcType=INTEGER}, 
+    values (#{id,jdbcType=BIGINT}, #{projectId,jdbcType=BIGINT}, #{projectDuration,jdbcType=BIGINT}, 
-      #{startTime,jdbcType=BIGINT}, #{endTime,jdbcType=BIGINT}, #{createdAt,jdbcType=TIMESTAMP}, 
+      #{siteNum,jdbcType=INTEGER}, #{startTime,jdbcType=BIGINT}, #{endTime,jdbcType=BIGINT}, 
-      #{updatedAt,jdbcType=TIMESTAMP}, #{recStatus,jdbcType=TINYINT}, #{projectDuration,jdbcType=BIGINT}
+      #{createdAt,jdbcType=TIMESTAMP}, #{updatedAt,jdbcType=TIMESTAMP}, #{recStatus,jdbcType=TINYINT}, 
+      #{videoStartTime,jdbcType=BIGINT}, #{videoEndTime,jdbcType=BIGINT}, #{restrict,jdbcType=TINYINT}
       )
   </insert>
   <insert id="insertSelective" parameterType="com.ccsens.mt.bean.po.CompeteProjectConfig">
@@ -123,6 +128,9 @@
       <if test="projectId != null">
         project_id,
       </if>
+      <if test="projectDuration != null">
+        project_duration,
+      </if>
       <if test="siteNum != null">
         site_num,
       </if>
@@ -141,8 +149,14 @@
       <if test="recStatus != null">
         rec_status,
       </if>
-      <if test="projectDuration != null">
+      <if test="videoStartTime != null">
-        project_duration,
+        video_start_time,
+      </if>
+      <if test="videoEndTime != null">
+        video_end_time,
+      </if>
+      <if test="restrict != null">
+        restrict,
       </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides=",">
@@ -152,6 +166,9 @@
       <if test="projectId != null">
         #{projectId,jdbcType=BIGINT},
       </if>
+      <if test="projectDuration != null">
+        #{projectDuration,jdbcType=BIGINT},
+      </if>
       <if test="siteNum != null">
         #{siteNum,jdbcType=INTEGER},
       </if>
@@ -170,8 +187,14 @@
       <if test="recStatus != null">
         #{recStatus,jdbcType=TINYINT},
       </if>
-      <if test="projectDuration != null">
+      <if test="videoStartTime != null">
-        #{projectDuration,jdbcType=BIGINT},
+        #{videoStartTime,jdbcType=BIGINT},
+      </if>
+      <if test="videoEndTime != null">
+        #{videoEndTime,jdbcType=BIGINT},
+      </if>
+      <if test="restrict != null">
+        #{restrict,jdbcType=TINYINT},
       </if>
     </trim>
   </insert>
@@ -190,6 +213,9 @@
       <if test="record.projectId != null">
         project_id = #{record.projectId,jdbcType=BIGINT},
       </if>
+      <if test="record.projectDuration != null">
+        project_duration = #{record.projectDuration,jdbcType=BIGINT},
+      </if>
       <if test="record.siteNum != null">
         site_num = #{record.siteNum,jdbcType=INTEGER},
       </if>
@@ -208,8 +234,14 @@
       <if test="record.recStatus != null">
         rec_status = #{record.recStatus,jdbcType=TINYINT},
       </if>
-      <if test="record.projectDuration != null">
+      <if test="record.videoStartTime != null">
-        project_duration = #{record.projectDuration,jdbcType=BIGINT},
+        video_start_time = #{record.videoStartTime,jdbcType=BIGINT},
+      </if>
+      <if test="record.videoEndTime != null">
+        video_end_time = #{record.videoEndTime,jdbcType=BIGINT},
+      </if>
+      <if test="record.restrict != null">
+        restrict = #{record.restrict,jdbcType=TINYINT},
       </if>
     </set>
     <if test="_parameter != null">
@@ -220,13 +252,16 @@
     update t_compete_project_config
     set id = #{record.id,jdbcType=BIGINT},
       project_id = #{record.projectId,jdbcType=BIGINT},
+      project_duration = #{record.projectDuration,jdbcType=BIGINT},
       site_num = #{record.siteNum,jdbcType=INTEGER},
       start_time = #{record.startTime,jdbcType=BIGINT},
       end_time = #{record.endTime,jdbcType=BIGINT},
       created_at = #{record.createdAt,jdbcType=TIMESTAMP},
       updated_at = #{record.updatedAt,jdbcType=TIMESTAMP},
       rec_status = #{record.recStatus,jdbcType=TINYINT},
-      project_duration = #{record.projectDuration,jdbcType=BIGINT}
+      video_start_time = #{record.videoStartTime,jdbcType=BIGINT},
+      video_end_time = #{record.videoEndTime,jdbcType=BIGINT},
+      restrict = #{record.restrict,jdbcType=TINYINT}
     <if test="_parameter != null">
       <include refid="Update_By_Example_Where_Clause" />
     </if>
@@ -237,6 +272,9 @@
       <if test="projectId != null">
         project_id = #{projectId,jdbcType=BIGINT},
       </if>
+      <if test="projectDuration != null">
+        project_duration = #{projectDuration,jdbcType=BIGINT},
+      </if>
       <if test="siteNum != null">
         site_num = #{siteNum,jdbcType=INTEGER},
       </if>
@@ -255,8 +293,14 @@
       <if test="recStatus != null">
         rec_status = #{recStatus,jdbcType=TINYINT},
       </if>
-      <if test="projectDuration != null">
+      <if test="videoStartTime != null">
-        project_duration = #{projectDuration,jdbcType=BIGINT},
+        video_start_time = #{videoStartTime,jdbcType=BIGINT},
+      </if>
+      <if test="videoEndTime != null">
+        video_end_time = #{videoEndTime,jdbcType=BIGINT},
+      </if>
+      <if test="restrict != null">
+        restrict = #{restrict,jdbcType=TINYINT},
       </if>
     </set>
     where id = #{id,jdbcType=BIGINT}
@@ -264,13 +308,16 @@
   <update id="updateByPrimaryKey" parameterType="com.ccsens.mt.bean.po.CompeteProjectConfig">
     update t_compete_project_config
     set project_id = #{projectId,jdbcType=BIGINT},
+      project_duration = #{projectDuration,jdbcType=BIGINT},
       site_num = #{siteNum,jdbcType=INTEGER},
       start_time = #{startTime,jdbcType=BIGINT},
       end_time = #{endTime,jdbcType=BIGINT},
       created_at = #{createdAt,jdbcType=TIMESTAMP},
       updated_at = #{updatedAt,jdbcType=TIMESTAMP},
       rec_status = #{recStatus,jdbcType=TINYINT},
-      project_duration = #{projectDuration,jdbcType=BIGINT}
+      video_start_time = #{videoStartTime,jdbcType=BIGINT},
+      video_end_time = #{videoEndTime,jdbcType=BIGINT},
+      restrict = #{restrict,jdbcType=TINYINT}
     where id = #{id,jdbcType=BIGINT}
   </update>
 </mapper>