1

web/src/main/java/com/ibeetl/jlw/entity/Competition.java

@@ -147,6 +147,25 @@ public class Competition extends BaseEntity{
     //除外的学生IDs
 
     private String excludedStudentIds;
+
+    //技术支持方
+    private String competitionTechnicalName;
+    //大赛轮播图1
+    private String competitionCarouselImage1;
+    //轮播图1超链接网址
+    private String competitionHyperlinkUrl1;
+    //大赛轮播图2
+    private String competitionCarouselImage2;
+    //轮播图2超链接网址
+    private String competitionHyperlinkUrl2;
+    //大赛轮播图3
+    private String competitionCarouselImage3;
+    //轮播图3超链接网址
+    private String competitionHyperlinkUrl3;
+    //试玩阶段开始时间
+    private String competitionFreetrialStartTime;
+    //试玩阶段结束时间
+    private String competitionFreetrialEndTime;
 	
     public Competition(){
     }
@@ -515,4 +534,76 @@ public class Competition extends BaseEntity{
     public void setExcludedStudentIds(String excludedStudentIds) {
         this.excludedStudentIds = excludedStudentIds;
     }
+
+    public String getCompetitionTechnicalName() {
+        return competitionTechnicalName;
+    }
+
+    public void setCompetitionTechnicalName(String competitionTechnicalName) {
+        this.competitionTechnicalName = competitionTechnicalName;
+    }
+
+    public String getCompetitionCarouselImage1() {
+        return competitionCarouselImage1;
+    }
+
+    public void setCompetitionCarouselImage1(String competitionCarouselImage1) {
+        this.competitionCarouselImage1 = competitionCarouselImage1;
+    }
+
+    public String getCompetitionHyperlinkUrl1() {
+        return competitionHyperlinkUrl1;
+    }
+
+    public void setCompetitionHyperlinkUrl1(String competitionHyperlinkUrl1) {
+        this.competitionHyperlinkUrl1 = competitionHyperlinkUrl1;
+    }
+
+    public String getCompetitionCarouselImage2() {
+        return competitionCarouselImage2;
+    }
+
+    public void setCompetitionCarouselImage2(String competitionCarouselImage2) {
+        this.competitionCarouselImage2 = competitionCarouselImage2;
+    }
+
+    public String getCompetitionHyperlinkUrl2() {
+        return competitionHyperlinkUrl2;
+    }
+
+    public void setCompetitionHyperlinkUrl2(String competitionHyperlinkUrl2) {
+        this.competitionHyperlinkUrl2 = competitionHyperlinkUrl2;
+    }
+
+    public String getCompetitionCarouselImage3() {
+        return competitionCarouselImage3;
+    }
+
+    public void setCompetitionCarouselImage3(String competitionCarouselImage3) {
+        this.competitionCarouselImage3 = competitionCarouselImage3;
+    }
+
+    public String getCompetitionHyperlinkUrl3() {
+        return competitionHyperlinkUrl3;
+    }
+
+    public void setCompetitionHyperlinkUrl3(String competitionHyperlinkUrl3) {
+        this.competitionHyperlinkUrl3 = competitionHyperlinkUrl3;
+    }
+
+    public String getCompetitionFreetrialStartTime() {
+        return competitionFreetrialStartTime;
+    }
+
+    public void setCompetitionFreetrialStartTime(String competitionFreetrialStartTime) {
+        this.competitionFreetrialStartTime = competitionFreetrialStartTime;
+    }
+
+    public String getCompetitionFreetrialEndTime() {
+        return competitionFreetrialEndTime;
+    }
+
+    public void setCompetitionFreetrialEndTime(String competitionFreetrialEndTime) {
+        this.competitionFreetrialEndTime = competitionFreetrialEndTime;
+    }
 }

web/src/main/java/com/ibeetl/jlw/web/query/CompetitionQuery.java

@@ -77,6 +77,24 @@ public class CompetitionQuery extends PageParam {
     private String classIds;
     @Query(name = "除外的学生IDs", display = false)
     private String excludedStudentIds;
+    @Query(name = "技术支持方", display = false)
+    private String competitionTechnicalName;
+    @Query(name = "大赛轮播图1", display = false)
+    private String competitionCarouselImage1;
+    @Query(name = "轮播图1超链接网址", display = false)
+    private String competitionHyperlinkUrl1;
+    @Query(name = "大赛轮播图2", display = false)
+    private String competitionCarouselImage2;
+    @Query(name = "轮播图2超链接网址", display = false)
+    private String competitionHyperlinkUrl2;
+    @Query(name = "大赛轮播图3", display = false)
+    private String competitionCarouselImage3;
+    @Query(name = "轮播图3超链接网址", display = false)
+    private String competitionHyperlinkUrl3;
+    @Query(name = "试玩阶段开始时间", display = false)
+    private String competitionFreetrialStartTime;
+    @Query(name = "试玩阶段结束时间", display = false)
+    private String competitionFreetrialEndTime;
 
     private String competitionStudentsJson; //参赛学员json
     private String competitionNewsJson; //大赛动态json
@@ -324,6 +342,15 @@ public class CompetitionQuery extends PageParam {
 
         pojo.setClassIds(this.getClassIds());
         pojo.setExcludedStudentIds(this.getExcludedStudentIds());
+        pojo.setCompetitionTechnicalName(this.getCompetitionTechnicalName());
+        pojo.setCompetitionCarouselImage1(this.getCompetitionCarouselImage1());
+        pojo.setCompetitionCarouselImage2(this.getCompetitionCarouselImage2());
+        pojo.setCompetitionCarouselImage3(this.getCompetitionCarouselImage3());
+        pojo.setCompetitionHyperlinkUrl1(this.getCompetitionHyperlinkUrl1());
+        pojo.setCompetitionHyperlinkUrl2(this.getCompetitionHyperlinkUrl2());
+        pojo.setCompetitionHyperlinkUrl3(this.getCompetitionHyperlinkUrl3());
+        pojo.setCompetitionFreetrialStartTime(this.getCompetitionFreetrialStartTime());
+        pojo.setCompetitionFreetrialEndTime(this.getCompetitionFreetrialEndTime());
         return pojo;
      }
 
@@ -488,5 +515,75 @@ public class CompetitionQuery extends PageParam {
         this.resourcesApplicationId = resourcesApplicationId;
     }
 
+    public String getCompetitionTechnicalName() {
+        return competitionTechnicalName;
+    }
+
+    public void setCompetitionTechnicalName(String competitionTechnicalName) {
+        this.competitionTechnicalName = competitionTechnicalName;
+    }
+
+    public String getCompetitionCarouselImage1() {
+        return competitionCarouselImage1;
+    }
+
+    public void setCompetitionCarouselImage1(String competitionCarouselImage1) {
+        this.competitionCarouselImage1 = competitionCarouselImage1;
+    }
+
+    public String getCompetitionHyperlinkUrl1() {
+        return competitionHyperlinkUrl1;
+    }
+
+    public void setCompetitionHyperlinkUrl1(String competitionHyperlinkUrl1) {
+        this.competitionHyperlinkUrl1 = competitionHyperlinkUrl1;
+    }
+
+    public String getCompetitionCarouselImage2() {
+        return competitionCarouselImage2;
+    }
+
+    public void setCompetitionCarouselImage2(String competitionCarouselImage2) {
+        this.competitionCarouselImage2 = competitionCarouselImage2;
+    }
+
+    public String getCompetitionHyperlinkUrl2() {
+        return competitionHyperlinkUrl2;
+    }
 
+    public void setCompetitionHyperlinkUrl2(String competitionHyperlinkUrl2) {
+        this.competitionHyperlinkUrl2 = competitionHyperlinkUrl2;
+    }
+
+    public String getCompetitionCarouselImage3() {
+        return competitionCarouselImage3;
+    }
+
+    public void setCompetitionCarouselImage3(String competitionCarouselImage3) {
+        this.competitionCarouselImage3 = competitionCarouselImage3;
+    }
+
+    public String getCompetitionHyperlinkUrl3() {
+        return competitionHyperlinkUrl3;
+    }
+
+    public void setCompetitionHyperlinkUrl3(String competitionHyperlinkUrl3) {
+        this.competitionHyperlinkUrl3 = competitionHyperlinkUrl3;
+    }
+
+    public String getCompetitionFreetrialStartTime() {
+        return competitionFreetrialStartTime;
+    }
+
+    public void setCompetitionFreetrialStartTime(String competitionFreetrialStartTime) {
+        this.competitionFreetrialStartTime = competitionFreetrialStartTime;
+    }
+
+    public String getCompetitionFreetrialEndTime() {
+        return competitionFreetrialEndTime;
+    }
+
+    public void setCompetitionFreetrialEndTime(String competitionFreetrialEndTime) {
+        this.competitionFreetrialEndTime = competitionFreetrialEndTime;
+    }
 }

web/src/main/resources/sql/jlw/competition.md

@@ -35,6 +35,15 @@ queryByCondition
         c.resources_application_id,
         c.class_ids,
         c.excluded_student_ids,
+        c.competition_technical_name,
+        c.competition_carousel_image1,
+        c.t.competition_hyperlink_url1,
+        c.competition_carousel_image2,
+        c.competition_hyperlink_url2,
+        c.competition_carousel_image3,
+        c.competition_hyperlink_url3,
+        c.competition_freetrial_start_time,
+        c.competition_freetrial_end_time,
           @if(showCompetitionGeneralization == 1){
             c.competition_generalization,
           @}
@@ -171,6 +180,33 @@ queryByCondition
       @if(!isEmpty(competitionDetailedStatuses)){
        and find_in_set(t.competition_detailed_status,#competitionDetailedStatuses#)
       @}
+    @if(!isEmpty(competitionTechnicalName)){
+    and t.competition_technical_name =#competitionTechnicalName#
+    @}
+    @if(!isEmpty(competitionCarouselImage1)){
+    and t.competition_carousel_image1 =#competitionCarouselImage1#
+    @}
+    @if(!isEmpty(competitionHyperlinkUrl1)){
+    and t.competition_hyperlink_url1 =#competitionHyperlinkUrl1#
+    @}
+    @if(!isEmpty(competitionCarouselImage2)){
+    and t.competition_carousel_image2 =#competitionCarouselImage2#
+    @}
+    @if(!isEmpty(competitionHyperlinkUrl2)){
+    and t.competition_hyperlink_url2 =#competitionHyperlinkUrl2#
+    @}
+    @if(!isEmpty(competitionCarouselImage3)){
+    and t.competition_carousel_image3 =#competitionCarouselImage3#
+    @}
+    @if(!isEmpty(competitionHyperlinkUrl3)){
+    and t.competition_hyperlink_url3 =#competitionHyperlinkUrl3#
+    @}
+    @if(!isEmpty(competitionFreetrialStartTime)){
+    and t.competition_freetrial_start_time =#competitionFreetrialStartTime#
+    @}
+    @if(!isEmpty(competitionFreetrialEndTime)){
+    and t.competition_freetrial_end_time =#competitionFreetrialEndTime#
+    @}
     ORDER BY t.competition_contest_start_time DESC
     
 queryByCondition2Student
@@ -210,6 +246,15 @@ queryByCondition2Student
         c.resources_application_id,
         c.class_ids,
         c.excluded_student_ids,
+        c.competition_technical_name,
+        c.competition_carousel_image1,
+        c.t.competition_hyperlink_url1,
+        c.competition_carousel_image2,
+        c.competition_hyperlink_url2,
+        c.competition_carousel_image3,
+        c.competition_hyperlink_url3,
+        c.competition_freetrial_start_time,
+        c.competition_freetrial_end_time,
           @if(showCompetitionGeneralization == 1){
             c.competition_generalization,
           @}
@@ -340,6 +385,33 @@ queryByCondition2Student
       @if(!isEmpty(competitionDetailedStatuses)){
        and find_in_set(t.competition_detailed_status,#competitionDetailedStatuses#)
       @}
+        @if(!isEmpty(competitionTechnicalName)){
+        and t.competition_technical_name =#competitionTechnicalName#
+        @}
+        @if(!isEmpty(competitionCarouselImage1)){
+        and t.competition_carousel_image1 =#competitionCarouselImage1#
+        @}
+        @if(!isEmpty(competitionHyperlinkUrl1)){
+        and t.competition_hyperlink_url1 =#competitionHyperlinkUrl1#
+        @}
+        @if(!isEmpty(competitionCarouselImage2)){
+        and t.competition_carousel_image2 =#competitionCarouselImage2#
+        @}
+        @if(!isEmpty(competitionHyperlinkUrl2)){
+        and t.competition_hyperlink_url2 =#competitionHyperlinkUrl2#
+        @}
+        @if(!isEmpty(competitionCarouselImage3)){
+        and t.competition_carousel_image3 =#competitionCarouselImage3#
+        @}
+        @if(!isEmpty(competitionHyperlinkUrl3)){
+        and t.competition_hyperlink_url3 =#competitionHyperlinkUrl3#
+        @}
+        @if(!isEmpty(competitionFreetrialStartTime)){
+        and t.competition_freetrial_start_time =#competitionFreetrialStartTime#
+        @}
+        @if(!isEmpty(competitionFreetrialEndTime)){
+        and t.competition_freetrial_end_time =#competitionFreetrialEndTime#
+        @}
     ORDER BY t.competition_contest_start_time DESC
 
     
@@ -398,6 +470,15 @@ getCompetitionValues
         c.resources_application_id,
         c.class_ids,
         c.excluded_student_ids,
+        c.competition_technical_name,
+        c.competition_carousel_image1,
+        c.t.competition_hyperlink_url1,
+        c.competition_carousel_image2,
+        c.competition_hyperlink_url2,
+        c.competition_carousel_image3,
+        c.competition_hyperlink_url3,
+        c.competition_freetrial_start_time,
+        c.competition_freetrial_end_time,
         (SELECT COUNT(*) FROM competition_students WHERE competition_id = c.competition_id) competition_student_number,
         CASE WHEN c.competition_type = 2 THEN (SELECT COUNT(*) FROM competition_students WHERE competition_id = c.competition_id AND is_captain = 1) ELSE NULL END competition_team_number,
         -- 1报名未开始 2报名中 3报名结束或大赛未开始 4大赛开始或任务一未开始 5任务一进行中 6任务一结束或任务二未开始 7任务二进行中 8任务二结束或任务三未开始 9任务三进行中 10任务三结束 11大赛结束 
@@ -507,6 +588,33 @@ getCompetitionValues
       @if(!isEmpty(resourcesApplicationId)){
         and t.resources_application_id =#resourcesApplicationId#
       @}
+  @if(!isEmpty(competitionTechnicalName)){
+  and t.competition_technical_name =#competitionTechnicalName#
+  @}
+  @if(!isEmpty(competitionCarouselImage1)){
+  and t.competition_carousel_image1 =#competitionCarouselImage1#
+  @}
+  @if(!isEmpty(competitionHyperlinkUrl1)){
+  and t.competition_hyperlink_url1 =#competitionHyperlinkUrl1#
+  @}
+  @if(!isEmpty(competitionCarouselImage2)){
+  and t.competition_carousel_image2 =#competitionCarouselImage2#
+  @}
+  @if(!isEmpty(competitionHyperlinkUrl2)){
+  and t.competition_hyperlink_url2 =#competitionHyperlinkUrl2#
+  @}
+  @if(!isEmpty(competitionCarouselImage3)){
+  and t.competition_carousel_image3 =#competitionCarouselImage3#
+  @}
+  @if(!isEmpty(competitionHyperlinkUrl3)){
+  and t.competition_hyperlink_url3 =#competitionHyperlinkUrl3#
+  @}
+  @if(!isEmpty(competitionFreetrialStartTime)){
+  and t.competition_freetrial_start_time =#competitionFreetrialStartTime#
+  @}
+  @if(!isEmpty(competitionFreetrialEndTime)){
+  and t.competition_freetrial_end_time =#competitionFreetrialEndTime#
+  @}
   
     
 getById
@@ -539,6 +647,15 @@ getById
     c.resources_application_id,
     c.class_ids,
     c.excluded_student_ids,
+    c.competition_technical_name,
+    c.competition_carousel_image1,
+    c.t.competition_hyperlink_url1,
+    c.competition_carousel_image2,
+    c.competition_hyperlink_url2,
+    c.competition_carousel_image3,
+    c.competition_hyperlink_url3,
+    c.competition_freetrial_start_time,
+    c.competition_freetrial_end_time,
     (SELECT COUNT(*) FROM competition_students WHERE competition_id = c.competition_id) competition_student_number,
     CASE WHEN c.competition_type = 2 THEN (SELECT COUNT(*) FROM competition_students WHERE competition_id = c.competition_id AND is_captain = 1) ELSE NULL END competition_team_number,
     -- 1报名未开始 2报名中 3报名结束或大赛未开始 4大赛开始或任务一未开始 5任务一进行中 6任务一结束或任务二未开始 7任务二进行中 8任务二结束或任务三未开始 9任务三进行中 10任务三结束 11大赛结束 
@@ -609,6 +726,15 @@ getValuesByQuery
         c.competition_task_three_start_time,
         c.competition_task_three_end_time,
         c.competition_judge_ids,
+        c.competition_technical_name,
+        c.competition_carousel_image1,
+        c.t.competition_hyperlink_url1,
+        c.competition_carousel_image2,
+        c.competition_hyperlink_url2,
+        c.competition_carousel_image3,
+        c.competition_hyperlink_url3,
+        c.competition_freetrial_start_time,
+        c.competition_freetrial_end_time,
         (SELECT group_concat(teacher_name ORDER BY find_in_set(teacher_id,c.competition_judge_ids)) FROM teacher where find_in_set(teacher_id,c.competition_judge_ids)) teacher_names,
         c.competition_weight,
         c.org_id,
@@ -749,5 +875,32 @@ getValuesByQuery
       @if(!isEmpty(competitionDetailedStatuses)){
        and find_in_set(t.competition_detailed_status,#competitionDetailedStatuses#)
       @}
+  @if(!isEmpty(competitionTechnicalName)){
+  and t.competition_technical_name =#competitionTechnicalName#
+  @}
+  @if(!isEmpty(competitionCarouselImage1)){
+  and t.competition_carousel_image1 =#competitionCarouselImage1#
+  @}
+  @if(!isEmpty(competitionHyperlinkUrl1)){
+  and t.competition_hyperlink_url1 =#competitionHyperlinkUrl1#
+  @}
+  @if(!isEmpty(competitionCarouselImage2)){
+  and t.competition_carousel_image2 =#competitionCarouselImage2#
+  @}
+  @if(!isEmpty(competitionHyperlinkUrl2)){
+  and t.competition_hyperlink_url2 =#competitionHyperlinkUrl2#
+  @}
+  @if(!isEmpty(competitionCarouselImage3)){
+  and t.competition_carousel_image3 =#competitionCarouselImage3#
+  @}
+  @if(!isEmpty(competitionHyperlinkUrl3)){
+  and t.competition_hyperlink_url3 =#competitionHyperlinkUrl3#
+  @}
+  @if(!isEmpty(competitionFreetrialStartTime)){
+  and t.competition_freetrial_start_time =#competitionFreetrialStartTime#
+  @}
+  @if(!isEmpty(competitionFreetrialEndTime)){
+  and t.competition_freetrial_end_time =#competitionFreetrialEndTime#
+  @}
     ORDER BY t.competition_contest_start_time DESC