diff --git a/mt/src/main/resources/mapper_dao/CompeteScoreDao.xml b/mt/src/main/resources/mapper_dao/CompeteScoreDao.xml
index 6d9f6786..bdcc8863 100644
--- a/mt/src/main/resources/mapper_dao/CompeteScoreDao.xml
+++ b/mt/src/main/resources/mapper_dao/CompeteScoreDao.xml
@@ -587,7 +587,8 @@
         having count(t2.groupName) <= 8
     </select>
     <select id="queryCountScoreTeam" resultType="com.ccsens.mt.bean.vo.ScoreVo$CountScorePublicity">
-        select t1.*, count(t2.id) +1 as rangee from
+        select * from
+        (select t1.groupName,t1.name, t1.companyName, t1.mainOneScore,t1.mainTwoScore,t1.shouldScore ,t1.deductTime, t1.finalScore, "" as remark, count(t2.id) +1 as rangee from
         (SELECT
         CONCAT(
         CASE	team.group_remark WHEN 1 THEN '小学'	WHEN 2 THEN	'中学' WHEN 3 THEN	'高职院校' WHEN 4 THEN	'本科院校' ELSE '俱乐部'END,
@@ -604,6 +605,7 @@
         FROM
         t_compete_count_score score,
         t_compete_start_order startOrder,
+        t_compete_video v,
         t_compete_team team,
         t_compete_team_member tm,
         t_compete_player player,
@@ -611,16 +613,19 @@
         WHERE
         score.project_id = #{projectId}
         AND score.site_order_id = startOrder.id
+        AND startOrder.project_id = v.project_id AND startOrder.player_id = v.player_id
         AND startOrder.player_id = team.id
         AND team.id = tm.compete_team_id
         AND tm.player_id = player.id
         AND player.company_id = company.id
+        AND startOrder.waiver = 0
         AND company.rec_status = 0
         AND score.rec_status = 0
         AND player.rec_status = 0
         AND startOrder.rec_status = 0
         AND team.rec_status = 0
         AND tm.rec_status = 0
+        AND v.rec_status = 0
         group by score.id) t1
         left join
         (SELECT
@@ -639,6 +644,7 @@
         FROM
         t_compete_count_score score,
         t_compete_start_order startOrder,
+        t_compete_video v,
         t_compete_team team,
         t_compete_team_member tm,
         t_compete_player player,
@@ -646,25 +652,137 @@
         WHERE
         score.project_id = #{projectId}
         AND score.site_order_id = startOrder.id
+        AND startOrder.project_id = v.project_id AND startOrder.player_id = v.player_id
         AND startOrder.player_id = team.id
         AND team.id = tm.compete_team_id
         AND tm.player_id = player.id
         AND player.company_id = company.id
+        AND startOrder.waiver = 0
         AND company.rec_status = 0
         AND score.rec_status = 0
         AND player.rec_status = 0
         AND startOrder.rec_status = 0
         AND team.rec_status = 0
         AND tm.rec_status = 0
+        AND v.rec_status = 0
         group by score.id) t2
         on
         t1.groupName = t2.groupName
         AND t1.finalScore &lt; t2.finalScore
         group by t1.id
-        order by t1.groupName, rangee
+        order by t1.groupName, rangee) t
+        union
+        -- 有视频没有分数
+        SELECT
+        CONCAT(
+        CASE	team.group_remark WHEN 1 THEN '小学'	WHEN 2 THEN	'中学' WHEN 3 THEN	'高职院校' WHEN 4 THEN	'本科院校' ELSE '俱乐部'END,
+        CASE team.gender_group	WHEN 0 THEN	'女子组' WHEN 1 THEN	'男子组' ELSE '混合组' END
+        ) AS groupName,
+        GROUP_CONCAT(player.name SEPARATOR '、') as name,
+        company.name as companyName,
+        0 as mainOneScore,
+        0 as mainTwoScore,
+        0 as shouldScore,
+        0 as deductTime,
+        0 as finalScore,
+        '裁判未打分' as remark,
+        null as rangee
+        FROM
+        (select o.* from t_compete_start_order o left join (select * from t_compete_count_score where rec_status = 0) s on o.id = s.site_order_id where o.project_id = #{projectId} and s.id is null) startOrder,
+        t_compete_video v,
+        t_compete_team team,
+        t_compete_team_member tm,
+        t_compete_player player,
+        t_compete_company company
+        WHERE
+        startOrder.project_id = v.project_id AND startOrder.player_id = v.player_id
+        AND startOrder.player_id = team.id
+        AND team.id = tm.compete_team_id
+        AND tm.player_id = player.id
+        AND player.company_id = company.id
+        AND startOrder.waiver = 0
+        AND company.rec_status = 0
+        AND player.rec_status = 0
+        AND startOrder.rec_status = 0
+        AND team.rec_status = 0
+        AND tm.rec_status = 0
+        AND v.rec_status = 0
+        group by startOrder.id
+
+        union
+        -- 取消资格
+        SELECT
+        CONCAT(
+        CASE	team.group_remark WHEN 1 THEN '小学'	WHEN 2 THEN	'中学' WHEN 3 THEN	'高职院校' WHEN 4 THEN	'本科院校' ELSE '俱乐部'END,
+        CASE team.gender_group	WHEN 0 THEN	'女子组' WHEN 1 THEN	'男子组' ELSE '混合组' END
+        ) AS groupName,
+        GROUP_CONCAT(player.name SEPARATOR '、') as name,
+        company.name as companyName,
+        0 as mainOneScore,
+        0 as mainTwoScore,
+        0 as shouldScore,
+        0 as deductTime,
+        0 as finalScore,
+        '取消资格' as remark,
+        null as rangee
+        FROM
+        t_compete_start_order startOrder,
+        t_compete_team team,
+        t_compete_team_member tm,
+        t_compete_player player,
+        t_compete_company company
+        WHERE
+        startOrder.project_id = #{projectId} and startOrder.waiver = 2
+        AND startOrder.player_id = team.id
+        AND team.id = tm.compete_team_id
+        AND tm.player_id = player.id
+        AND player.company_id = company.id
+        AND startOrder.waiver = 2
+        AND company.rec_status = 0
+        AND player.rec_status = 0
+        AND startOrder.rec_status = 0
+        AND team.rec_status = 0
+        AND tm.rec_status = 0
+        group by startOrder.id
+
+        union
+        -- 报名没有视频
+        SELECT
+        CONCAT(
+        CASE	team.group_remark WHEN 1 THEN '小学'	WHEN 2 THEN	'中学' WHEN 3 THEN	'高职院校' WHEN 4 THEN	'本科院校' ELSE '俱乐部'END,
+        CASE team.gender_group	WHEN 0 THEN	'女子组' WHEN 1 THEN	'男子组' ELSE '混合组' END
+        ) AS groupName,
+        GROUP_CONCAT(player.name SEPARATOR '、') as name,
+        company.name as companyName,
+        0 as mainOneScore,
+        0 as mainTwoScore,
+        0 as shouldScore,
+        0 as deductTime,
+        0 as finalScore,
+        '弃权' as remark,
+        null as rangee
+        FROM
+        (select o.* from t_compete_start_order o left join (select * from t_compete_video where rec_status = 0) v on o.project_id = v.project_id AND o.player_id = v.player_id where o.project_id = #{projectId} and o.waiver = 0 and v.id is null and o.rec_status = 0) startOrder,
+        t_compete_team team,
+        t_compete_team_member tm,
+        t_compete_player player,
+        t_compete_company company
+        WHERE
+        startOrder.player_id = team.id
+        AND team.id = tm.compete_team_id
+        AND tm.player_id = player.id
+        AND player.company_id = company.id
+        AND startOrder.waiver = 0
+        AND company.rec_status = 0
+        AND player.rec_status = 0
+        AND team.rec_status = 0
+        AND tm.rec_status = 0
+        group by startOrder.id
     </select>
     <select id="queryCountScorePerson" resultType="com.ccsens.mt.bean.vo.ScoreVo$CountScorePublicity">
-        select t1.*, count(t2.id) + 1 as rangee from
+
+        select * from (
+        select t1.groupName,t1.name, t1.companyName, t1.mainOneScore,t1.mainTwoScore,t1.shouldScore ,t1.deductTime, t1.finalScore, "" as remark, count(t2.id) +1 as rangee from
         (SELECT
         competeGroup.group_name as groupName,
         player.NAME as name,
@@ -678,20 +796,23 @@
         FROM
         t_compete_count_score score,
         t_compete_start_order startOrder,
+        t_compete_video v,
         t_compete_project_player pp,
         t_compete_player player,
         t_compete_group competeGroup,
         t_compete_company p
         WHERE
         score.project_id = #{projectId}
-        AND score.site_order_id = startOrder.id
+        AND score.site_order_id = startOrder.id AND startOrder.waiver = 0
         AND startOrder.player_id = pp.id
+        AND startOrder.project_id = v.project_id AND startOrder.player_id = v.player_id
         AND pp.player_id = player.id
         AND player.compete_group_id = competeGroup.id
         and player.company_id = p.id
         AND score.rec_status = 0
         AND player.rec_status = 0
         AND startOrder.rec_status = 0
+        AND v.rec_status = 0
         AND competeGroup.rec_status = 0)t1
         left join
         (SELECT
@@ -707,13 +828,15 @@
         FROM
         t_compete_count_score score,
         t_compete_start_order startOrder,
+        t_compete_video v,
         t_compete_project_player pp,
         t_compete_player player,
         t_compete_group competeGroup,
         t_compete_company p
         WHERE
         score.project_id = #{projectId}
-        AND score.site_order_id = startOrder.id
+        AND score.site_order_id = startOrder.id AND startOrder.waiver = 0
+        AND startOrder.project_id = v.project_id AND startOrder.player_id = v.player_id
         AND startOrder.player_id = pp.id
         AND pp.player_id = player.id
         AND player.compete_group_id = competeGroup.id
@@ -721,10 +844,124 @@
         AND score.rec_status = 0
         AND player.rec_status = 0
         AND startOrder.rec_status = 0
+        AND v.rec_status = 0
         AND competeGroup.rec_status = 0)t2
         on t1.groupName = t2.groupName and t1.finalScore &lt; t2.finalScore
-        group by t1.id
-        order by t1.groupName, rangee
+       group by t1.id
+       order by t1.groupName, rangee) t
+        union
+        -- 上传视频未打分
+        SELECT
+        competeGroup.group_name as groupName,
+        player.NAME as name,
+        p.NAME  as companyName,
+
+        0 as mainOneScore,
+        0 as mainTwoScore,
+        0 as shouldScore,
+        0 as deductTime,
+        0 as finalScore,
+        "裁判未打分" as remark,
+        null as rangee
+        FROM
+        (select o.* from t_compete_start_order o left join (select * from t_compete_count_score s where s.rec_status = 0) s on o.id = s.site_order_id and o.rec_status = 0) startOrder,
+        t_compete_video v,
+        t_compete_project_player pp,
+        t_compete_player player,
+        t_compete_group competeGroup,
+        t_compete_company p
+        WHERE
+        startOrder.project_id = #{projectId}
+        AND startOrder.player_id = pp.id
+        AND pp.player_id = player.id
+        AND player.compete_group_id = competeGroup.id
+        and player.company_id = p.id
+        AND player.rec_status = 0
+        AND startOrder.rec_status = 0
+        AND competeGroup.rec_status = 0
+        union
+        -- 上传视频未打分
+        SELECT
+        competeGroup.group_name as groupName,
+        player.NAME as name,
+        p.NAME  as companyName,
+        0 as mainOneScore,
+        0 as mainTwoScore,
+        0 as shouldScore,
+        0 as deductTime,
+        0 as finalScore,
+        "裁判未打分" as remark,
+        null as rangee
+        FROM
+        (select o.* from t_compete_start_order o left join (select * from t_compete_count_score s where s.rec_status = 0) s on o.id = s.site_order_id and o.rec_status = 0 and o.waiver = 0) startOrder,
+        t_compete_video v,
+        t_compete_project_player pp,
+        t_compete_player player,
+        t_compete_group competeGroup,
+        t_compete_company p
+        WHERE
+        startOrder.project_id = #{projectId}
+        AND startOrder.player_id = pp.id
+        AND pp.player_id = player.id
+        AND player.compete_group_id = competeGroup.id
+        and player.company_id = p.id
+        AND player.rec_status = 0
+        AND startOrder.rec_status = 0
+        AND competeGroup.rec_status = 0
+        union
+        -- 取消资格
+        SELECT
+        competeGroup.group_name as groupName,
+        player.NAME as name,
+        p.NAME  as companyName,
+        0 as mainOneScore,
+        0 as mainTwoScore,
+        0 as shouldScore,
+        0 as deductTime,
+        0 as finalScore,
+        "取消资格" as remark,
+        null as rangee
+        FROM
+        t_compete_start_order startOrder,
+        t_compete_project_player pp,
+        t_compete_player player,
+        t_compete_group competeGroup,
+        t_compete_company p
+        WHERE
+        startOrder.project_id = #{projectId} and startOrder.waiver = 2
+        AND startOrder.player_id = pp.id
+        AND pp.player_id = player.id
+        AND player.compete_group_id = competeGroup.id
+        and player.company_id = p.id
+        AND player.rec_status = 0
+        AND startOrder.rec_status = 0
+        AND competeGroup.rec_status = 0
+        union
+        -- 报名没有视频
+        SELECT
+        competeGroup.group_name as groupName,
+        player.NAME as name,
+        p.NAME  as companyName,
+        0 as mainOneScore,
+        0 as mainTwoScore,
+        0 as shouldScore,
+        0 as deductTime,
+        0 as finalScore,
+        "弃权" as remark,
+        null as rangee
+        FROM
+        (select o.* from t_compete_start_order o left join (select * from t_compete_video where rec_status = 0) v on o.project_id = v.project_id and o.player_id = v.player_id where o.project_id = #{projectId} and v.id is null and o.rec_status = 0 and o.waiver = 0 )startOrder,
+        t_compete_project_player pp,
+        t_compete_player player,
+        t_compete_group competeGroup,
+        t_compete_company p
+        WHERE
+        startOrder.player_id = pp.id
+        AND pp.player_id = player.id
+        AND player.compete_group_id = competeGroup.id
+        and player.company_id = p.id
+        AND player.rec_status = 0
+        AND competeGroup.rec_status = 0
     </select>
     <select id="queryVarietyScore" resultType="com.ccsens.mt.bean.vo.CompeteVo$TotalScoreDisplay">
         SELECT
@@ -745,16 +982,68 @@
         (select s.site_order_id, j.chief_judgment, sum(s.score) as score from t_compete_variety_score s, t_compete_judgment j where s.judgment_id = j.id and s.project_id = #{projectId} and s.rec_status = 0 and j.rec_status = 0 group by s.site_order_id,j.chief_judgment) t
         group by t.site_order_id) s,
         t_compete_start_order o,
+        t_compete_video v,
         t_compete_team t,
         t_compete_team_member m,
         t_compete_player p,
         t_compete_company c
         where s.site_order_id = o.id and o.player_id = t.id and t.id = m.compete_team_id and m.player_id = p.id and p.company_id = c.id
-        and o.rec_status = 0 and t.rec_status = 0 and m.rec_status = 0 and p.rec_status = 0 and c.rec_status = 0
+        and o.project_id = v.project_id and o.player_id = v.player_id and o.waiver = 0
+        and o.rec_status = 0 and t.rec_status = 0 and m.rec_status = 0 and p.rec_status = 0 and c.rec_status = 0 and v.rec_status = 0
         group by s.site_order_id
         order by result desc
         	)t,
 	(SELECT @rownum := ${page})t1
+
+	union
+	-- 有视频没有分数
+		select
+			o.id as site_order_id, 0 as referee0,0 as referee1,0 as referee2,0 as referee3,0 as referee4,0 as referee5,0 as referee6,0 as referee7, c.name as companyName, GROUP_CONCAT(p.name), 0 as avg1To3, 0 as avg4To6, 0 as result, '裁判未打分' as remark, null as rownum
+		from
+		(select o.* from t_compete_start_order o left join (select * from t_compete_variety_score where rec_status = 0) s on o.id = s.site_order_id where s.id is null and o.rec_status = 0 and o.project_id = #{projectId} ) o,
+		t_compete_video v,
+		t_compete_team t,
+		t_compete_team_member m,
+		t_compete_player p,
+		t_compete_company c
+		where o.project_id = v.project_id and o.player_id = v.player_id and o.player_id = t.id and t.id = m.compete_team_id and m.player_id = p.id and p.company_id = c.id
+		and o.waiver = 0
+		and o.rec_status = 0 and t.rec_status = 0 and m.rec_status = 0 and p.rec_status = 0 and c.rec_status = 0
+		group by o.id
+
+	union
+	-- 取消资格
+	(
+		select
+			o.id as site_order_id, 0 as referee0,0 as referee1,0 as referee2,0 as referee3,0 as referee4,0 as referee5,0 as referee6,0 as referee7, c.name as companyName, GROUP_CONCAT(p.name), 0 as avg1To3, 0 as avg4To6, 0 as result, '取消资格' as remark, null as rownum
+		from
+		t_compete_start_order o,
+		t_compete_team t,
+		t_compete_team_member m,
+		t_compete_player p,
+		t_compete_company c
+		where o.player_id = t.id and t.id = m.compete_team_id and m.player_id = p.id and p.company_id = c.id
+		and o.project_id = #{projectId} and o.waiver = 2
+		and o.rec_status = 0 and t.rec_status = 0 and m.rec_status = 0 and p.rec_status = 0 and c.rec_status = 0
+		group by o.id
+	)
+
+	union
+-- 	报名没有视频
+		select
+			o.id as site_order_id, 0 as referee0,0 as referee1,0 as referee2,0 as referee3,0 as referee4,0 as referee5,0 as referee6,0 as referee7, c.name as companyName, GROUP_CONCAT(p.name), 0 as avg1To3, 0 as avg4To6, 0 as result, '弃权' as remark, null as rownum
+		from
+		(select o.* from t_compete_start_order o left join (select * from t_compete_video where rec_status = 0) v on o.project_id = v.project_id and o.player_id = v.player_id and o.project_id = #{projectId}  and o.rec_status = 0) o,
+		t_compete_team t,
+		t_compete_team_member m,
+		t_compete_player p,
+		t_compete_company c
+		where o.player_id = t.id and t.id = m.compete_team_id and m.player_id = p.id and p.company_id = c.id
+
+		and t.rec_status = 0 and m.rec_status = 0 and p.rec_status = 0 and c.rec_status = 0
+		group by o.id
+
+	order by rownum is null, rownum asc
     </select>
     <select id="selAllDaiBiaoDui" resultType="com.ccsens.mt.bean.vo.CompeteVo$DaiBiaoDUi">
             select q.*,identity,GROUP_CONCAT(tcch.name) as name  From