diff --git a/web/src/main/java/com/ibeetl/jlw/service/CompetitionService.java b/web/src/main/java/com/ibeetl/jlw/service/CompetitionService.java index e81032ee..02b9fb51 100644 --- a/web/src/main/java/com/ibeetl/jlw/service/CompetitionService.java +++ b/web/src/main/java/com/ibeetl/jlw/service/CompetitionService.java @@ -690,7 +690,7 @@ public class CompetitionService extends CoreBaseService{ Long resourcesApplicationId = null; UniversitiesCollegesJurisdictionExperimentalSystem uSystem = (UniversitiesCollegesJurisdictionExperimentalSystem)platformService.getOther(); - if(((Integer)1).equals(uSystem.getType())){ + if(uSystem != null && 1==uSystem.getType()){ resourcesApplicationId = uSystem.getTypeId(); } diff --git a/web/src/main/java/com/ibeetl/jlw/web/CompetitionController.java b/web/src/main/java/com/ibeetl/jlw/web/CompetitionController.java index 31c25c56..cf3a8c6d 100644 --- a/web/src/main/java/com/ibeetl/jlw/web/CompetitionController.java +++ b/web/src/main/java/com/ibeetl/jlw/web/CompetitionController.java @@ -204,11 +204,11 @@ public class CompetitionController{ @Function("competition.add") @ResponseBody public JsonResult add(CompetitionQuery competitionQuery, @SCoreUser CoreUser coreUser){ - Teacher teacher = new Teacher(); - teacher.setUserId(coreUser.getId()); - teacher = teacherService.getValues(teacher).get(0); +// Teacher teacher = new Teacher(); +// teacher.setUserId(coreUser.getId()); +// teacher = teacherService.getValues(teacher).get(0); - competitionQuery.setTeacherId(teacher.getTeacherId()); + competitionQuery.setTeacherId(coreUser.getId()); competitionQuery.setUserId(coreUser.getId()); competitionQuery.setOrgId(coreUser.getOrgId()); 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 e428272d..cd90a553 100644 --- a/web/src/main/resources/static/js/jlw/competition/add.js +++ b/web/src/main/resources/static/js/jlw/competition/add.js @@ -225,31 +225,14 @@ 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){ + }else if(sign == 1 || sign == 2 || sign == 3 || sign == 4 || sign == 5){ $(".syb").show(); $(".xyb").show(); $(".sbx").show(); if(sign == 2){ - if(competitionType_ == 1){ //个人赛 - $(".competitionType_1").show(); - $(".competitionType_2").hide(); - loadCompetitionUser(0); - }else if(competitionType_ == 2){ //团队赛 - $(".competitionType_1").hide(); - $(".competitionType_2").show(); - loadCompetitionUser(2); - } - - }else if(sign == 3){ loadDSRW(); } - }else if(sign == 5){ - $(".syb").show(); - $(".xyb").hide(); - $(".sbx").show(); - loadTeacherTable(1); - }else{ - if(sign == 6 && $.isEmpty(editor2)){ + if(sign == 5 && $.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){ @@ -260,10 +243,7 @@ layui.define([ 'form', 'laydate', 'table','element','upload','competitionApi','t } editor2 = Lib.editorMd("competitionAwardList"); } - if(sign == 7 && $.isEmpty(editor3)){ - editor3 = Lib.editorMd("competitionNewsContent"); - } - if(sign == 8 && $.isEmpty(editor4)){ + if(sign == 4 && $.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){ @@ -274,6 +254,14 @@ layui.define([ 'form', 'laydate', 'table','element','upload','competitionApi','t } editor4 = Lib.editorMd("competitionCommonProblem"); } + }else if(sign == 6){ + $(".syb").show(); + $(".xyb").hide(); + $(".sbx").show(); + if($.isEmpty(editor3)) { + editor3 = Lib.editorMd("competitionNewsContent"); + } + }else{ $(".sbx").hide(); } if(sign == 2 || sign == 5){//上一步、保存、下一步的位置 @@ -1692,7 +1680,7 @@ layui.define([ 'form', 'laydate', 'table','element','upload','competitionApi','t var param = { competitionId:($("input[name='competitionId']").val() || '') } - if(i == 0){//大赛概况 + if(i === 0){//大赛概况 var competitionName = $("input[name='competitionName']").val(); // if($.isEmpty(competitionName)){ // layer.msg("请填写大赛名称！", { @@ -1743,7 +1731,7 @@ layui.define([ 'form', 'laydate', 'table','element','upload','competitionApi','t param.competitionFinalsLimit = competitionFinalsLimit; param.competitionGeneralization = competitionGeneralization; param.competitionGeneralizationOriginal = competitionGeneralizationOriginal; - }else if( i == 1){//竞赛时间 + }else if( i === 1){//竞赛时间 var competitionEnrollStartTime = $("input[name='competitionEnrollStartTime']").val(); var competitionEnrollEndTime = $("input[name='competitionEnrollEndTime']").val(); var competitionContestStartTime = $("input[name='competitionContestStartTime']").val(); @@ -1759,30 +1747,7 @@ layui.define([ 'form', 'laydate', 'table','element','upload','competitionApi','t param.competitionTaskThreeStartTime = competitionTaskThreeStartTime; param.competitionTaskThreeEndTime = competitionTaskThreeEndTime; - }else if( i == 2){//参赛学员 - var competitionStudentsJson = new Array(); - $.each(studentTempMap,function (k,v){ - competitionStudentsJson.push(v); - }); - var classIds = $("input[name='classIds']:checked").val();//是否允许自主报名 1：是 2：否 - if(classIds == 1){ - if(treeList[1].getValue('value').length <= 0){ - layer.msg("请选择可自主报名的班级！", { - offset: ['50%'], - icon: 2, - time: 1500 //2秒关闭（如果不配置，默认是3秒） - }); - return ; - }else { - param.classIds = treeList[1].getValue('value').join(",");//班级范围IDs(值为空时则不能自主报名) - param.excludedStudentIds = treeList[4].getValue('value').join(",");//班级范围IDs(值为空时则不能自主报名) - } - }else { - param.classIds = -1; - param.excludedStudentIds = - 1; - } - param.competitionStudentsJson = JSON.stringify(competitionStudentsJson); - }else if( i == 3){//大赛任务 + }else if( i === 2){//大赛任务 param.ct1QuestionIds = $("input[name='ct1QuestionIds']").val();//大赛任务一选中的题目 param.ct2QuestionIds = $("input[name='ct2QuestionIds']").val(); //大赛任务二选中的题目 param.ct1SingleChoiceSource = $("input[name='dx_fz']").val();//大赛任务一 单选题分值 @@ -1806,14 +1771,12 @@ layui.define([ 'form', 'laydate', 'table','element','upload','competitionApi','t } }); param.ct2QuestionSources = ct2QuestionSources; //大赛任务二选中的题目 步骤的分值 - }else if( i == 4){//成绩权重 + }else if( i === 3){//成绩权重 var competition_weight_1 = $("input[name='competition_weight_1']").val();//客观题 var competition_weight_2 = $("input[name='competition_weight_2']").val();//竞赛案例 var competition_weight_3 = $("input[name='competition_weight_3']").val();//汇报答辩 param.competitionWeight = competition_weight_1 + "," + competition_weight_2 + ","+competition_weight_3;//成绩权重 param.competitionDefenceScoreStandard = $("#editCDSFrame .layui-input-block ").html();//评分标准 - }else if( i == 5){//大赛评委 - param.competitionJudgeIds = tempTeacherIds; } submitInfo(param,t); } diff --git a/web/src/main/resources/templates/jlw/competition/add.html b/web/src/main/resources/templates/jlw/competition/add.html index d011bc96..cc65b142 100644 --- a/web/src/main/resources/templates/jlw/competition/add.html +++ b/web/src/main/resources/templates/jlw/competition/add.html @@ -81,13 +81,11 @@
@@ -213,75 +211,6 @@
- -
-
-
-
自主报名：
-
- - -
- -
-
-
- -
-
-
-
-
-
-
- - 移除 - - 导出 - - -
-
-
- -
-
- - 移除 - 导出 - - -
-
-
- - -
@@ -366,25 +295,29 @@
- -
-
-
- - 移除 - - 导出 - - + +
+
+
+
+ +
+
+ + +
+
+
-
-
- @@ -485,31 +418,7 @@
- -
-
-
-
- -
-
- - -
-
-
-
-
-
- -
- -
-
-
-
-
+