|
|
@@ -6,7 +6,9 @@
|
|
|
<select id="selectScoreSheetMetadata" resultType="org.dromara.system.domain.vo.ScoreSheetVo">
|
|
|
SELECT
|
|
|
e.event_name as name,
|
|
|
- p.score_rule as paiMing,
|
|
|
+ e.event_code as bianhao,
|
|
|
+ p.score_rule as chengjiType,
|
|
|
+ p.order_type as paiMing,
|
|
|
p.project_name as projectName,
|
|
|
p.project_type as type,
|
|
|
p.classification as classification,
|
|
|
@@ -20,18 +22,21 @@
|
|
|
AND (JSON_CONTAINS(p.referee_group, JSON_ARRAY(referee_id))
|
|
|
OR JSON_CONTAINS(p.referee_group, JSON_ARRAY(CAST(referee_id AS CHAR))))
|
|
|
) as caipan,
|
|
|
- p.timing_format as guize,
|
|
|
+ (CASE WHEN p.timing_format IS NOT NULL THEN p.timing_format ELSE p.count_unit END) as guize,
|
|
|
(SELECT config_value FROM game_event_config WHERE event_id = p.event_id
|
|
|
AND config_key = 'event_tip' AND del_flag = '0' LIMIT 1) as eventTip,
|
|
|
- IFNULL((SELECT COUNT(*) FROM game_athlete a WHERE a.event_id = p.event_id AND a.del_flag = '0'
|
|
|
+ IFNULL((SELECT COUNT(DISTINCT a.athlete_id) FROM game_athlete a
|
|
|
+ WHERE a.event_id = p.event_id AND a.del_flag = '0'
|
|
|
AND (JSON_CONTAINS(a.project_value, JSON_ARRAY(p.project_id))
|
|
|
- OR JSON_CONTAINS(a.project_value, JSON_ARRAY(CAST(p.project_id AS CHAR)))))
|
|
|
+ OR JSON_CONTAINS(a.project_value, JSON_ARRAY(CAST(p.project_id AS CHAR)))
|
|
|
+ ))
|
|
|
, 0) as popnum,
|
|
|
- IFNULL((SELECT COUNT(*)
|
|
|
+ IFNULL((SELECT COUNT(DISTINCT s.score_id)
|
|
|
FROM game_score s
|
|
|
JOIN game_athlete a ON s.athlete_id = a.athlete_id AND a.del_flag = '0'
|
|
|
WHERE s.project_id = p.project_id AND s.del_flag = '0'
|
|
|
- AND ((p.classification = '0' AND s.individual_performance > 0) OR (p.classification = '1' AND s.team_performance > 0))
|
|
|
+ AND ((p.classification = '0' AND s.individual_performance IS NOT NULL AND s.individual_performance > 0)
|
|
|
+ OR (p.classification = '1' AND s.team_performance IS NOT NULL AND s.team_performance > 0))
|
|
|
)
|
|
|
, 0) as finishedParticipants
|
|
|
FROM game_event_project p
|