系列赛详情加载调整

repository/src/main/java/com/antai/sport/http/server/repository/series/entity/SeriesMatch.java

@@ -38,6 +38,11 @@ public class SeriesMatch implements Serializable {
      */
     private Long roundId;
 
+    /**
+     * 赛区id
+     */
+    private Long areaId;
+
     /**
      * 类型 10 预选赛 20 淘汰赛
      */

repository/src/main/java/com/antai/sport/http/server/repository/series/entity/SeriesRound.java

@@ -47,6 +47,11 @@ public class SeriesRound implements Serializable {
      */
     private Integer status;
 
+    /**
+     * 是否已开始
+     */
+    private Boolean started;
+
     /**
      * 轮次是否已完成
      */

server-api/src/main/java/com/antai/sport/http/server/server/api/business/series/mapper/SeriesBusinessMapper.java

@@ -4,6 +4,7 @@ import com.antai.sport.http.server.repository.series.entity.SeriesApply;
 import com.antai.sport.http.server.server.api.business.series.vo.SeriesAreaVO;
 import com.antai.sport.http.server.server.api.business.series.vo.SeriesListVO;
 import com.antai.sport.http.server.server.api.business.series.vo.SeriesNoticeVO;
+import com.antai.sport.http.server.server.api.business.series.vo.SeriesRoundVO;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
@@ -14,6 +15,8 @@ public interface SeriesBusinessMapper {
 
     List<SeriesNoticeVO> getSeriesNotice(@Param("seriesId") Long seriesId);
 
+    List<SeriesRoundVO> getSeriesRound(@Param("seriesId") Long seriesId);
+
     Boolean checkUserSeriesIsApplied(@Param("seriesId") Long seriesId, @Param("sportUserId") Long sportUserId);
 
     List<SeriesAreaVO> getSeriesAreaList(@Param("seriesId") Long seriesId);

server-api/src/main/java/com/antai/sport/http/server/server/api/business/series/service/SeriesService.java

@@ -54,6 +54,7 @@ public class SeriesService {
         SeriesDetailsVO result = seriesConverter.toSeriesDetailVO(series, status);
         result.setNoticeList(seriesBusinessMapper.getSeriesNotice(id));
         result.setApplied(seriesBusinessMapper.checkUserSeriesIsApplied(id, sportUserId));
+        result.setRoundList(seriesBusinessMapper.getSeriesRound(id));
         return result;
     }
 

server-api/src/main/java/com/antai/sport/http/server/server/api/business/series/vo/SeriesDetailsVO.java

@@ -33,5 +33,7 @@ public class SeriesDetailsVO {
     private Boolean applied;
     @ApiModelProperty("通知列表")
     List<SeriesNoticeVO> noticeList;
+    @ApiModelProperty("轮次列表")
+    List<SeriesRoundVO> roundList;
 
 }

server-api/src/main/java/com/antai/sport/http/server/server/api/business/series/vo/SeriesRoundVO.java

+package com.antai.sport.http.server.server.api.business.series.vo;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.time.LocalDateTime;
+
+@ApiModel("系列赛轮次")
+@Data
+public class SeriesRoundVO {
+    @ApiModelProperty("id")
+    private Long id;
+    @ApiModelProperty("轮次名称")
+    private String name;
+    @ApiModelProperty("类型 10 预选赛 20 淘汰赛")
+    private Integer type;
+    @ApiModelProperty("开始时间")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm", timezone = "GMT+8")
+    private LocalDateTime startTime;
+    @ApiModelProperty("是否已开始")
+    private Boolean started;
+    @ApiModelProperty("是否已结束")
+    private Boolean finished;
+}

server-api/src/main/resources/mapper/series/SeriesBusinessMapper.xml

@@ -15,11 +15,20 @@
     <select id="getSeriesNotice" resultType="com.antai.sport.http.server.server.api.business.series.vo.SeriesNoticeVO">
         select content,create_time
         from series_notice
-        where status = 20
+        where status = 20 and deleted = 0
           and  series_id = #{seriesId}
         order by create_time desc
     </select>
     
+    <select id="getSeriesRound" resultType="com.antai.sport.http.server.server.api.business.series.vo.SeriesRoundVO">
+        select *
+        from series_round
+        where status = 20
+          and deleted = 0
+          and series_id = #{seriesId}
+        order by show_order
+    </select>
+    
     <select id="checkUserSeriesIsApplied" resultType="java.lang.Boolean">
         select count(1)>0 from series_apply where series_id = #{seriesId} and sport_user_id = #{sportUserId}
     </select>