tianzeOrg
/
tianze-pro
8
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

竞赛管理

Browse Source
beetlsql3-dev
xuliangtong 2 years ago
parent f38f83e4bb
commit 4e105f5ac7
5 changed files with 120 additions and 57 deletions
Show Stats Download Patch File Download Diff File

18
web/src/main/java/com/ibeetl/jlw/entity/Competition.java
Unescape Escape View File

@ -168,6 +168,8 @@ public class Competition extends BaseEntity{
//试玩阶段结束时间 //试玩阶段结束时间
private String competitionFreetrialEndTime; private String competitionFreetrialEndTime;
private String sign; private String sign;
private String competitionSystemSchedule;
private String tradingRules;
public Competition(){ public Competition(){
} }
@ -616,4 +618,20 @@ public class Competition extends BaseEntity{
public void setSign(String sign) { public void setSign(String sign) {
this.sign = 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;
}
} }

22
web/src/main/java/com/ibeetl/jlw/web/query/CompetitionQuery.java
Unescape Escape View File

@ -97,6 +97,10 @@ public class CompetitionQuery extends PageParam {
private String competitionFreetrialEndTime; private String competitionFreetrialEndTime;
@Query(name = "大赛类别", display = false) @Query(name = "大赛类别", display = false)
private String sign; private String sign;
@Query(name = "赛制赛程", display = false)
private String competitionSystemSchedule;
@Query(name = "交易规则", display = false)
private String tradingRules;
private String competitionStudentsJson; //参赛学员json private String competitionStudentsJson; //参赛学员json
private String competitionNewsJson; //大赛动态json private String competitionNewsJson; //大赛动态json
@ -354,6 +358,8 @@ public class CompetitionQuery extends PageParam {
pojo.setCompetitionFreetrialStartTime(this.getCompetitionFreetrialStartTime()); pojo.setCompetitionFreetrialStartTime(this.getCompetitionFreetrialStartTime());
pojo.setCompetitionFreetrialEndTime(this.getCompetitionFreetrialEndTime()); pojo.setCompetitionFreetrialEndTime(this.getCompetitionFreetrialEndTime());
pojo.setSign(this.getSign()); pojo.setSign(this.getSign());
pojo.setCompetitionSystemSchedule(this.getCompetitionSystemSchedule());
pojo.setTradingRules(this.getTradingRules());
return pojo; return pojo;
} }
@ -597,4 +603,20 @@ public class CompetitionQuery extends PageParam {
public void setSign(String sign) { public void setSign(String sign) {
this.sign = 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;
}
} }

8
web/src/main/resources/sql/jlw/competition.md
Unescape Escape View File

@ -44,7 +44,7 @@ queryByCondition
c.competition_hyperlink_url3, c.competition_hyperlink_url3,
c.competition_freetrial_start_time, c.competition_freetrial_start_time,
c.competition_freetrial_end_time, c.competition_freetrial_end_time,
c.sign, c.sign,c.competition_system_schedule,c.trading_rules,
@if(showCompetitionGeneralization == 1){ @if(showCompetitionGeneralization == 1){
c.competition_generalization, c.competition_generalization,
@} @}
@ -255,7 +255,7 @@ queryByCondition2Student
c.competition_carousel_image3, c.competition_carousel_image3,
c.competition_hyperlink_url3, c.competition_hyperlink_url3,
c.competition_freetrial_start_time, 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){ @if(showCompetitionGeneralization == 1){
c.competition_generalization, c.competition_generalization,
@} @}
@ -479,7 +479,7 @@ getCompetitionValues
c.competition_carousel_image3, c.competition_carousel_image3,
c.competition_hyperlink_url3, c.competition_hyperlink_url3,
c.competition_freetrial_start_time, 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, (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, 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大赛结束 -- 1报名未开始 2报名中 3报名结束或大赛未开始 4大赛开始或任务一未开始 5任务一进行中 6任务一结束或任务二未开始 7任务二进行中 8任务二结束或任务三未开始 9任务三进行中 10任务三结束 11大赛结束
@ -735,7 +735,7 @@ getValuesByQuery
c.competition_carousel_image3, c.competition_carousel_image3,
c.competition_hyperlink_url3, c.competition_hyperlink_url3,
c.competition_freetrial_start_time, 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, (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.competition_weight,
c.org_id, c.org_id,

14
web/src/main/resources/static/js/jlw/competition/add.js
Unescape Escape View File

@ -266,14 +266,18 @@ layui.define([ 'form', 'laydate', 'table','element','upload','competitionApi','t
$(".syb").hide(); $(".syb").hide();
$(".xyb").show(); $(".xyb").show();
$(".sbx").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(); $(".syb").show();
$(".xyb").show(); $(".xyb").show();
$(".sbx").show(); $(".sbx").show();
if(sign == 2){ if(sign == 3){
loadDSRW(); loadDSRW();
} }
if(sign == 5 && $.isEmpty(editor2)){ if(sign == 8 && $.isEmpty(editor2)){
if(!$.isEmpty($("input[name='competitionId']").val())){ if(!$.isEmpty($("input[name='competitionId']").val())){
var ret = Common.getAjax("/jlw/competition/view.json",{competitionId:$("input[name='competitionId']").val(),part: 7}); var ret = Common.getAjax("/jlw/competition/view.json",{competitionId:$("input[name='competitionId']").val(),part: 7});
if(ret.code == 0){ if(ret.code == 0){
@ -284,7 +288,7 @@ layui.define([ 'form', 'laydate', 'table','element','upload','competitionApi','t
} }
editor2 = Lib.editorMd("competitionAwardList"); editor2 = Lib.editorMd("competitionAwardList");
} }
if(sign == 4 && $.isEmpty(editor4)){ if(sign == 6 && $.isEmpty(editor4)){
if(!$.isEmpty($("input[name='competitionId']").val())){ if(!$.isEmpty($("input[name='competitionId']").val())){
var ret = Common.getAjax("/jlw/competition/view.json",{competitionId:$("input[name='competitionId']").val(),part: 9}); var ret = Common.getAjax("/jlw/competition/view.json",{competitionId:$("input[name='competitionId']").val(),part: 9});
if(ret.code == 0){ if(ret.code == 0){
@ -295,7 +299,7 @@ layui.define([ 'form', 'laydate', 'table','element','upload','competitionApi','t
} }
editor4 = Lib.editorMd("competitionCommonProblem"); editor4 = Lib.editorMd("competitionCommonProblem");
} }
}else if(sign == 6){ }else if(sign == 8){
$(".syb").show(); $(".syb").show();
$(".xyb").hide(); $(".xyb").hide();
$(".sbx").show(); $(".sbx").show();

83
web/src/main/resources/templates/jlw/competition/add.html
Unescape Escape View File

@ -98,7 +98,7 @@
<li lay-id="12" class="cjwt" ${sign=='2'?'':'style="display:none"'}>院校风采</li> <li lay-id="12" class="cjwt" ${sign=='2'?'':'style="display:none"'}>院校风采</li>
</ul> </ul>
<div class="layui-tab-content"> <div class="layui-tab-content">
<!--大赛概况--> <!--大赛概况0-->
<div class="layui-tab-item layui-show"> <div class="layui-tab-item layui-show">
<div class="layui-row"> <div class="layui-row">
<div class="layui-inline"> <div class="layui-inline">
@ -270,7 +270,7 @@
</div> </div>
</div> </div>
<!--竞赛时间--> <!--竞赛时间1-->
<div class="layui-tab-item"> <div class="layui-tab-item">
<div class="layui-row"> <div class="layui-row">
<div class="layui-inline"> <div class="layui-inline">
@ -299,12 +299,15 @@
</div> </div>
</div> </div>
</div> </div>
<!--大赛任务--> <!--赛组管理2-->
<div class="layui-tab-item" ${sign=='2'?'':'style="display:none"'}>
</div>
<!--大赛任务3-->
<div class="layui-tab-item" id="dsrw_view"> <div class="layui-tab-item" id="dsrw_view">
</div> </div>
<!--成绩权重--> <!--成绩权重4-->
<div class="layui-tab-item"> <div class="layui-tab-item" ${sign=='1'?'':'style="display:none"'}>
<div style="margin: 0 60px 30px;;border: 1px solid rgba(215, 215, 215, 1);border-radius: 10px;padding: 15px 20px 20px;"> <div style="margin: 0 60px 30px;;border: 1px solid rgba(215, 215, 215, 1);border-radius: 10px;padding: 15px 20px 20px;">
<label class="layui-form-label">成绩权重设置：</label> <label class="layui-form-label">成绩权重设置：</label>
<div class="layui-row"> <div class="layui-row">
@ -383,7 +386,10 @@
</div> </div>
</div> </div>
</div> </div>
<!-- 常见问题 competitionCommonProblem--> <!-- 赛制赛程5 -->
<div class="layui-tab-item" ${sign=='2'?'':'style="display:none"'}>
</div>
<!-- 常见问题6 competitionCommonProblem-->
<div class="layui-tab-item"> <div class="layui-tab-item">
<div style="min-width: 1200px;"> <div style="min-width: 1200px;">
<div class="layui-row"> <div class="layui-row">
@ -408,32 +414,7 @@
</div> </div>
</div> </div>
</div> </div>
<!--获奖名单 competitionAwardList--> <!--大赛动态7 动态内容：competitionNewsContent 动态图片：competitionNewsPicture-->
<div class="layui-tab-item">
<div style="min-width: 1200px;">
<div class="layui-row">
<div class="layui-inline" style="width: 96%;">
<label class="layui-form-label">获奖名单：</label>
<div class="layui-input-block">
<div id="competitionAwardList">
<!-- competitionAwardList-->
<textarea
style="display:none;"></textarea>
</div>
</div>
</div>
</div>
<div class="layui-row">
<div class="layui-inline" style="width: 96%;">
<label class="layui-form-label"></label>
<div class="layui-input-block">
<button type="button" class="layui-btn bg_button" id="addCompetitionAwardList">保存</button>
</div>
</div>
</div>
</div>
</div>
<!--大赛动态 动态内容：competitionNewsContent 动态图片：competitionNewsPicture-->
<div class="layui-tab-item"> <div class="layui-tab-item">
<div style="min-width: 1200px;"> <div style="min-width: 1200px;">
<div class="layui-row"> <div class="layui-row">
@ -506,6 +487,44 @@
</div> </div>
</div> </div>
</div> </div>
<!--获奖名单8 competitionAwardList-->
<div class="layui-tab-item">
<div style="min-width: 1200px;">
<div class="layui-row">
<div class="layui-inline" style="width: 96%;">
<label class="layui-form-label">获奖名单：</label>
<div class="layui-input-block">
<div id="competitionAwardList">
<!-- competitionAwardList-->
<textarea
style="display:none;"></textarea>
</div>
</div>
</div>
</div>
<div class="layui-row">
<div class="layui-inline" style="width: 96%;">
<label class="layui-form-label"></label>
<div class="layui-input-block">
<button type="button" class="layui-btn bg_button" id="addCompetitionAwardList">保存</button>
</div>
</div>
</div>
</div>
</div>
<!-- 赛制赛程9 -->
<div class="layui-tab-item" ${sign=='2'?'':'style="display:none"'}>
</div>
<!-- 赛制赛程10 -->
<div class="layui-tab-item" ${sign=='2'?'':'style="display:none"'}>
</div>
<!-- 赛制赛程11 -->
<div class="layui-tab-item" ${sign=='2'?'':'style="display:none"'}>
</div>
<!-- 赛制赛程12 -->
<div class="layui-tab-item" ${sign=='2'?'':'style="display:none"'}>
</div>
</div> </div>
<div class="layui-row sbx" style="margin-left: 190px;"> <div class="layui-row sbx" style="margin-left: 190px;">

Write Preview
Loading…
Cancel
Save