diff --git a/web/src/main/java/com/ibeetl/jlw/entity/Competition.java b/web/src/main/java/com/ibeetl/jlw/entity/Competition.java index 7f9f8667..4d4b18fe 100644 --- a/web/src/main/java/com/ibeetl/jlw/entity/Competition.java +++ b/web/src/main/java/com/ibeetl/jlw/entity/Competition.java @@ -168,6 +168,8 @@ public class Competition extends BaseEntity{ //试玩阶段结束时间 private String competitionFreetrialEndTime; private String sign; + private String competitionSystemSchedule; + private String tradingRules; public Competition(){ } @@ -616,4 +618,20 @@ public class Competition extends BaseEntity{ public void setSign(String sign) { this.sign = sign; } + + public String getCompetitionSystemSchedule() { + return competitionSystemSchedule; + } + + public void setCompetitionSystemSchedule(String competitionSystemSchedule) { + this.competitionSystemSchedule = competitionSystemSchedule; + } + + public String getTradingRules() { + return tradingRules; + } + + public void setTradingRules(String tradingRules) { + this.tradingRules = tradingRules; + } } diff --git a/web/src/main/java/com/ibeetl/jlw/web/query/CompetitionQuery.java b/web/src/main/java/com/ibeetl/jlw/web/query/CompetitionQuery.java index 09a898e7..b0f213ca 100644 --- a/web/src/main/java/com/ibeetl/jlw/web/query/CompetitionQuery.java +++ b/web/src/main/java/com/ibeetl/jlw/web/query/CompetitionQuery.java @@ -97,6 +97,10 @@ public class CompetitionQuery extends PageParam { private String competitionFreetrialEndTime; @Query(name = "大赛类别", display = false) private String sign; + @Query(name = "赛制赛程", display = false) + private String competitionSystemSchedule; + @Query(name = "交易规则", display = false) + private String tradingRules; private String competitionStudentsJson; //参赛学员json private String competitionNewsJson; //大赛动态json @@ -354,6 +358,8 @@ public class CompetitionQuery extends PageParam { pojo.setCompetitionFreetrialStartTime(this.getCompetitionFreetrialStartTime()); pojo.setCompetitionFreetrialEndTime(this.getCompetitionFreetrialEndTime()); pojo.setSign(this.getSign()); + pojo.setCompetitionSystemSchedule(this.getCompetitionSystemSchedule()); + pojo.setTradingRules(this.getTradingRules()); return pojo; } @@ -597,4 +603,20 @@ public class CompetitionQuery extends PageParam { public void setSign(String sign) { this.sign = sign; } + + public String getCompetitionSystemSchedule() { + return competitionSystemSchedule; + } + + public void setCompetitionSystemSchedule(String competitionSystemSchedule) { + this.competitionSystemSchedule = competitionSystemSchedule; + } + + public String getTradingRules() { + return tradingRules; + } + + public void setTradingRules(String tradingRules) { + this.tradingRules = tradingRules; + } } diff --git a/web/src/main/resources/sql/jlw/competition.md b/web/src/main/resources/sql/jlw/competition.md index ca1c41da..9e873d9b 100644 --- a/web/src/main/resources/sql/jlw/competition.md +++ b/web/src/main/resources/sql/jlw/competition.md @@ -44,7 +44,7 @@ queryByCondition c.competition_hyperlink_url3, c.competition_freetrial_start_time, c.competition_freetrial_end_time, - c.sign, + c.sign,c.competition_system_schedule,c.trading_rules, @if(showCompetitionGeneralization == 1){ c.competition_generalization, @} @@ -255,7 +255,7 @@ queryByCondition2Student c.competition_carousel_image3, c.competition_hyperlink_url3, c.competition_freetrial_start_time, - c.competition_freetrial_end_time,c.sign, + c.competition_freetrial_end_time,c.sign,c.competition_system_schedule,c.trading_rules, @if(showCompetitionGeneralization == 1){ c.competition_generalization, @} @@ -479,7 +479,7 @@ getCompetitionValues c.competition_carousel_image3, c.competition_hyperlink_url3, c.competition_freetrial_start_time, - c.competition_freetrial_end_time,c.sign, + c.competition_freetrial_end_time,c.sign,c.competition_system_schedule,c.trading_rules, (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大赛结束 @@ -735,7 +735,7 @@ getValuesByQuery c.competition_carousel_image3, c.competition_hyperlink_url3, c.competition_freetrial_start_time, - c.competition_freetrial_end_time,c.sign, + c.competition_freetrial_end_time,c.sign,c.competition_system_schedule,c.trading_rules, (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, diff --git a/web/src/main/resources/static/js/jlw/competition/add.js b/web/src/main/resources/static/js/jlw/competition/add.js index b29e51c6..be6dda96 100644 --- a/web/src/main/resources/static/js/jlw/competition/add.js +++ b/web/src/main/resources/static/js/jlw/competition/add.js @@ -266,14 +266,18 @@ layui.define([ 'form', 'laydate', 'table','element','upload','competitionApi','t $(".syb").hide(); $(".xyb").show(); $(".sbx").show(); - }else if(sign == 1 || sign == 2 || sign == 3 || sign == 4 || sign == 5){ + }else if(sign == 1 || sign == 2 || sign == 3 || sign == 4 + || sign == 6 + || sign == 7 + || sign == 8 + || sign == 5 ){ $(".syb").show(); $(".xyb").show(); $(".sbx").show(); - if(sign == 2){ + if(sign == 3){ loadDSRW(); } - if(sign == 5 && $.isEmpty(editor2)){ + if(sign == 8 && $.isEmpty(editor2)){ if(!$.isEmpty($("input[name='competitionId']").val())){ var ret = Common.getAjax("/jlw/competition/view.json",{competitionId:$("input[name='competitionId']").val(),part: 7}); if(ret.code == 0){ @@ -284,7 +288,7 @@ layui.define([ 'form', 'laydate', 'table','element','upload','competitionApi','t } editor2 = Lib.editorMd("competitionAwardList"); } - if(sign == 4 && $.isEmpty(editor4)){ + if(sign == 6 && $.isEmpty(editor4)){ if(!$.isEmpty($("input[name='competitionId']").val())){ var ret = Common.getAjax("/jlw/competition/view.json",{competitionId:$("input[name='competitionId']").val(),part: 9}); if(ret.code == 0){ @@ -295,7 +299,7 @@ layui.define([ 'form', 'laydate', 'table','element','upload','competitionApi','t } editor4 = Lib.editorMd("competitionCommonProblem"); } - }else if(sign == 6){ + }else if(sign == 8){ $(".syb").show(); $(".xyb").hide(); $(".sbx").show(); diff --git a/web/src/main/resources/templates/jlw/competition/add.html b/web/src/main/resources/templates/jlw/competition/add.html index 8c6ad6fb..9d11093c 100644 --- a/web/src/main/resources/templates/jlw/competition/add.html +++ b/web/src/main/resources/templates/jlw/competition/add.html @@ -98,7 +98,7 @@
  • 院校风采
    • - +
    @@ -270,7 +270,7 @@
    - +
    @@ -299,12 +299,15 @@
    - + +
    +
    +
    - -
    + +
    @@ -383,7 +386,10 @@
    - + +
    +
    +
    @@ -408,32 +414,7 @@
    - -
    -
    -
    -
    - -
    -
    - - -
    -
    -
    -
    -
    -
    - -
    - -
    -
    -
    -
    -
    - +
    @@ -472,25 +453,25 @@
      -
    • - -
      - -

      ${competitionNewsAddTime}

      -
      - - - - - -
      -
      - ${item.competitionNewsContent} -
      +
    • + +
      + +

      ${competitionNewsAddTime}

      +
      + + + + + +
      +
      + ${item.competitionNewsContent}
      -
      • +
    +
  • @@ -506,6 +487,44 @@
    • + +
    +
    +
    +
    + +
    +
    + + +
    +
    +
    +
    +
    +
    + +
    + +
    +
    +
    +
    +
    + +
    +
    + +
    +
    + +
    +
    + +
    +
    +