diff --git a/doc/sql/mysql/tianze-pro-update.sql b/doc/sql/mysql/tianze-pro-update.sql index c5b2f28c..791af056 100644 --- a/doc/sql/mysql/tianze-pro-update.sql +++ b/doc/sql/mysql/tianze-pro-update.sql @@ -132,3 +132,5 @@ create table teacher_open_course_score_weight alter table teacher_open_course_score_weight comment '教师-我的课程-成绩权重'; ALTER TABLE teacher_open_course_score_dashboard ADD COLUMN teacher_open_course_id bigint(20) COMMENT '课程开课ID'; + +ALTER TABLE resources_application ADD COLUMN link_secret_key varchar(255) COMMENT '链接秘钥'; diff --git a/web/src/main/java/com/ibeetl/jlw/entity/HandsOn.java b/web/src/main/java/com/ibeetl/jlw/entity/HandsOn.java index 8310583e..f4f433f4 100644 --- a/web/src/main/java/com/ibeetl/jlw/entity/HandsOn.java +++ b/web/src/main/java/com/ibeetl/jlw/entity/HandsOn.java @@ -78,6 +78,7 @@ public class HandsOn extends BaseEntity{ } private Long userId; + //附件 private String trainingData; public HandsOn(){ diff --git a/web/src/main/java/com/ibeetl/jlw/entity/ResourcesApplication.java b/web/src/main/java/com/ibeetl/jlw/entity/ResourcesApplication.java index e2d45558..4370d825 100644 --- a/web/src/main/java/com/ibeetl/jlw/entity/ResourcesApplication.java +++ b/web/src/main/java/com/ibeetl/jlw/entity/ResourcesApplication.java @@ -26,7 +26,10 @@ public class ResourcesApplication extends BaseEntity{ //应用链接 private String applicationLink ; - + + //链接秘钥 + private String linkSecretKey ; + //一级关联 private String applicationOneLevelRelation ; @@ -287,4 +290,12 @@ public class ResourcesApplication extends BaseEntity{ public void setApplicationSecondLevelRelation(String applicationSecondLevelRelation) { this.applicationSecondLevelRelation = applicationSecondLevelRelation; } + + public String getLinkSecretKey() { + return linkSecretKey; + } + + public void setLinkSecretKey(String linkSecretKey) { + this.linkSecretKey = linkSecretKey; + } } diff --git a/web/src/main/java/com/ibeetl/jlw/service/TeacherOpenCourseScoreDashboardService.java b/web/src/main/java/com/ibeetl/jlw/service/TeacherOpenCourseScoreDashboardService.java index 0ce7657f..78e76dfd 100644 --- a/web/src/main/java/com/ibeetl/jlw/service/TeacherOpenCourseScoreDashboardService.java +++ b/web/src/main/java/com/ibeetl/jlw/service/TeacherOpenCourseScoreDashboardService.java @@ -121,6 +121,18 @@ public class TeacherOpenCourseScoreDashboardService extends CoreBaseService studentScores = new ArrayList<>(); for (int i = 0; i < 10; i++) { @@ -418,30 +429,32 @@ public class TeacherOpenCourseScoreDashboardService extends CoreBaseService 0) { - scoreDashboard.setLastStatus("及格"); - }else { - scoreDashboard.setLastStatus("不及格"); - } - }else { - if (NumberUtil.compare(totalScore.longValue(), 60) > 0) { - scoreDashboard.setLastStatus("及格"); - }else { - scoreDashboard.setLastStatus("不及格"); - } - } - + lastStatus(weight, totalScore, scoreDashboard); } - scoreDashboard.setTeacherOpenCourseId(teacherOpenCourseId); studentScores.add(scoreDashboard); } - //通过课程id删除存量数据 teacherOpenCourseScoreDashboardDao.deleteByTeacherOpenCourseId(teacherOpenCourseId); teacherOpenCourseScoreDashboardDao.insertBatch(studentScores); return true; } + + public void lastStatus(TeacherOpenCourseScoreWeight weight, BigDecimal totalScore, TeacherOpenCourseScoreDashboard scoreDashboard) { + String resultStatusSetting = weight.getResultStatusSetting(); + if ("1".equals(resultStatusSetting)) { + if (NumberUtil.compare(totalScore.longValue(), Long.parseLong(weight.getDichotomyScore())) > 0) { + scoreDashboard.setLastStatus("及格"); + }else { + scoreDashboard.setLastStatus("不及格"); + } + }else { + if (NumberUtil.compare(totalScore.longValue(), 60) > 0) { + scoreDashboard.setLastStatus("及格"); + }else { + scoreDashboard.setLastStatus("不及格"); + } + } + } + } diff --git a/web/src/main/java/com/ibeetl/jlw/web/query/ResourcesApplicationQuery.java b/web/src/main/java/com/ibeetl/jlw/web/query/ResourcesApplicationQuery.java index 7ef0b87b..4c5514dd 100644 --- a/web/src/main/java/com/ibeetl/jlw/web/query/ResourcesApplicationQuery.java +++ b/web/src/main/java/com/ibeetl/jlw/web/query/ResourcesApplicationQuery.java @@ -14,6 +14,8 @@ public class ResourcesApplicationQuery extends PageParam { private String applicationName; @Query(name = "应用链接", display = false) private String applicationLink; + @Query(name = "链接秘钥", display = false) + private String linkSecretKey ; @Query(name = "一级关联", display = false) private String applicationOneLevelRelation; @Query(name = "二级关联", display = false) @@ -140,7 +142,15 @@ public class ResourcesApplicationQuery extends PageParam { this.applicationInfoOriginal = applicationInfoOriginal; } - public ResourcesApplication pojo(){ + public String getLinkSecretKey() { + return linkSecretKey; + } + + public void setLinkSecretKey(String linkSecretKey) { + this.linkSecretKey = linkSecretKey; + } + + public ResourcesApplication pojo(){ ResourcesApplication pojo = new ResourcesApplication(); pojo.setResourcesApplicationId(this.getResourcesApplicationId()); pojo.setApplicationName(this.getApplicationName()); @@ -158,6 +168,7 @@ public class ResourcesApplicationQuery extends PageParam { pojo.setUserId(this.getUserId()); pojo.setApplicationIntroductionOriginal(this.getApplicationIntroductionOriginal()); pojo.setApplicationInfoOriginal(this.getApplicationInfoOriginal()); + pojo.setLinkSecretKey(this.getLinkSecretKey()); return pojo; } diff --git a/web/src/main/resources/sql/jlw/resourcesApplication.md b/web/src/main/resources/sql/jlw/resourcesApplication.md index d72ad6bc..43893cfc 100644 --- a/web/src/main/resources/sql/jlw/resourcesApplication.md +++ b/web/src/main/resources/sql/jlw/resourcesApplication.md @@ -20,6 +20,9 @@ queryByCondition @if(!isEmpty(applicationLink)){ and t.application_link =#applicationLink# @} + @if(!isEmpty(linkSecretKey)){ + and t.link_secret_key =#linkSecretKey# + @} @if(!isEmpty(applicationOneLevelRelation)){ and t.application_one_level_relation =#applicationOneLevelRelation# @} @@ -91,6 +94,9 @@ getResourcesApplicationValues @if(!isEmpty(applicationLink)){ and t.application_link =#applicationLink# @} + @if(!isEmpty(linkSecretKey)){ + and t.link_secret_key =#linkSecretKey# + @} @if(!isEmpty(applicationOneLevelRelation)){ and t.application_one_level_relation =#applicationOneLevelRelation# @} diff --git a/web/src/main/resources/static/js/jlw/resourcesApplication/add.js b/web/src/main/resources/static/js/jlw/resourcesApplication/add.js index ade1ac9f..dc56c79f 100644 --- a/web/src/main/resources/static/js/jlw/resourcesApplication/add.js +++ b/web/src/main/resources/static/js/jlw/resourcesApplication/add.js @@ -132,6 +132,7 @@ layui.define([ 'form', 'laydate', 'table','upload','layedit','resourcesApplicati resourcesApplicationId:$("input[name='resourcesApplicationId']").val(), applicationName:$("input[name='applicationName']").val(), applicationLink:$("input[name='applicationLink']").val(), + linkSecretKey:$("input[name='linkSecretKey']").val(), applicationOneLevelRelation:$("select[name='applicationOneLevelRelation']").val(), applicationSecondLevelRelation:$("select[name='applicationSecondLevelRelation']").val(), applicationCarousel:$("input[name='applicationCarousel_1']").val() + ","+$("input[name='applicationCarousel_2']").val(), diff --git a/web/src/main/resources/static/js/jlw/resourcesApplication/index.js b/web/src/main/resources/static/js/jlw/resourcesApplication/index.js index 985fc97b..442405e9 100644 --- a/web/src/main/resources/static/js/jlw/resourcesApplication/index.js +++ b/web/src/main/resources/static/js/jlw/resourcesApplication/index.js @@ -43,7 +43,7 @@ layui.define([ 'form', 'laydate', 'table' ], function(exports) { field : 'applicationLink', title : '应用链接',align:"center" },{ - field : '', + field : 'linkSecretKey', title : '链接秘钥',align:"center" },{ field : 'userId',title : '操作',align:"center", width:150,templet: function (d) { diff --git a/web/src/main/resources/templates/jlw/resourcesApplication/add.html b/web/src/main/resources/templates/jlw/resourcesApplication/add.html index 827e3601..97699f30 100644 --- a/web/src/main/resources/templates/jlw/resourcesApplication/add.html +++ b/web/src/main/resources/templates/jlw/resourcesApplication/add.html @@ -25,6 +25,16 @@ +
+
+
+ +
+ +
+
+
+
diff --git a/web/src/main/resources/templates/jlw/teacherOpenCourseScoreDashboard/add.html b/web/src/main/resources/templates/jlw/teacherOpenCourseScoreDashboard/add.html index b0e28ff2..03442035 100644 --- a/web/src/main/resources/templates/jlw/teacherOpenCourseScoreDashboard/add.html +++ b/web/src/main/resources/templates/jlw/teacherOpenCourseScoreDashboard/add.html @@ -3,16 +3,10 @@
-
- -
- -
-
- +
@@ -22,13 +16,13 @@
- +
- +
@@ -38,13 +32,13 @@
- +
- +
@@ -54,13 +48,13 @@
- +
- +
@@ -70,13 +64,13 @@
- +
- +
@@ -84,33 +78,11 @@
- +
-
- -
- -
-
-
-
-
-
-
- -
- -
-
-
- -
- -
-