应用管理

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 '链接秘钥';

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(){

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;
+    }
 }

web/src/main/java/com/ibeetl/jlw/service/TeacherOpenCourseScoreDashboardService.java

@@ -121,6 +121,18 @@ public class TeacherOpenCourseScoreDashboardService extends CoreBaseService<Teac
     public String edit(TeacherOpenCourseScoreDashboardQuery teacherOpenCourseScoreDashboardQuery){
         String msg = "";
         TeacherOpenCourseScoreDashboard teacherOpenCourseScoreDashboard = teacherOpenCourseScoreDashboardQuery.pojo();
+        BigDecimal signinScore = teacherOpenCourseScoreDashboard.getSigninScore();
+        BigDecimal courseScore = teacherOpenCourseScoreDashboard.getCourseScore();
+        BigDecimal realOperationScore = teacherOpenCourseScoreDashboard.getRealOperationScore();
+        BigDecimal questionHomeworkScore = teacherOpenCourseScoreDashboard.getQuestionHomeworkScore();
+        BigDecimal examScore = teacherOpenCourseScoreDashboard.getExamScore();
+        BigDecimal chatScore = teacherOpenCourseScoreDashboard.getChatScore();
+        BigDecimal totalScore = signinScore.add(courseScore).add(realOperationScore).add(questionHomeworkScore).add(examScore).add(chatScore);
+        teacherOpenCourseScoreDashboard.setTotalScore(totalScore);
+        BigDecimal manualScore = teacherOpenCourseScoreDashboard.getManualScore();
+        BigDecimal lastScore = totalScore.add(manualScore);
+        teacherOpenCourseScoreDashboard.setLastScore(lastScore);
+        String lastStatus = teacherOpenCourseScoreDashboard.getLastStatus();
         teacherOpenCourseScoreDashboardDao.updateTemplateById(teacherOpenCourseScoreDashboard);
         return msg;
     }
@@ -393,7 +405,6 @@ public class TeacherOpenCourseScoreDashboardService extends CoreBaseService<Teac
     public boolean updateGrades(Long teacherOpenCourseId) {
         //查询权重
         TeacherOpenCourseScoreWeight weight = weightDao.single(teacherOpenCourseId);
-
         //todo 查询签到成绩,章节练习成绩,课程实操成绩,作业成绩,考试成绩,互动成绩
         List<TeacherOpenCourseScoreDashboard> studentScores = new ArrayList<>();
         for (int i = 0; i < 10; i++) {
@@ -418,30 +429,32 @@ public class TeacherOpenCourseScoreDashboardService extends CoreBaseService<Teac
                     .add(chatScore);
             scoreDashboard.setTotalScore(totalScore);
             if (weight != null) {
-                String resultStatusSetting = weight.getResultStatusSetting();
+                lastStatus(weight, totalScore, scoreDashboard);
-                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("不及格");
-                    }
-                }
-
             }
-
             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("不及格");
+            }
+        }
+    }
+
 }

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;
      }
 

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#
       @}

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(),

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) {

web/src/main/resources/templates/jlw/resourcesApplication/add.html

@@ -25,6 +25,16 @@
             </div>
         </div>
     </div>
+    <div class="layui-row">
+        <div class="layui-form-item">
+            <div class="layui-inline">
+                <label class="layui-form-label"><span class="req">*</span>链接秘钥：</label>
+                <div class="layui-input-inline">
+                    <input type="text" name="linkSecretKey" value="${resourcesApplication.linkSecretKey}" class="layui-input" >
+                </div>
+            </div>
+        </div>
+    </div>
     <div class="layui-row">
         <div class="layui-form-item">
             <div class="layui-inline">

web/src/main/resources/templates/jlw/teacherOpenCourseScoreDashboard/add.html

@@ -3,16 +3,10 @@
 <form class="layui-form" id="addForm">
     <div class="layui-row">
         <div class="layui-form-item">
-            <div class="layui-inline">
-            	<label class="layui-form-label">学生ID</label>
-				<div class="layui-input-inline">
-					<input type="text" id="studentId" name="studentId"  value="${teacherOpenCourseScoreDashboard.studentId}"   class="layui-input" >
-				</div>
-            </div>
             <div class="layui-inline">
             	<label class="layui-form-label">签到成绩</label>
 				<div class="layui-input-inline">
-					<input type="text" id="signinScore" name="signinScore"  value="${teacherOpenCourseScoreDashboard.signinScore}"   class="layui-input" >
+					<input  type="number" id="signinScore" name="signinScore"  value="${teacherOpenCourseScoreDashboard.signinScore}"   class="layui-input" >
 				</div>
             </div>
         </div>
@@ -22,13 +16,13 @@
             <div class="layui-inline">
             	<label class="layui-form-label">章节练习成绩</label>
 				<div class="layui-input-inline">
-					<input type="text" id="courseScore" name="courseScore"  value="${teacherOpenCourseScoreDashboard.courseScore}"   class="layui-input" >
+					<input type="number" id="courseScore" name="courseScore"  value="${teacherOpenCourseScoreDashboard.courseScore}"   class="layui-input" >
 				</div>
             </div>
             <div class="layui-inline">
             	<label class="layui-form-label">课程实操成绩</label>
 				<div class="layui-input-inline">
-					<input type="text" id="realOperationScore" name="realOperationScore"  value="${teacherOpenCourseScoreDashboard.realOperationScore}"   class="layui-input" >
+					<input type="number" id="realOperationScore" name="realOperationScore"  value="${teacherOpenCourseScoreDashboard.realOperationScore}"   class="layui-input" >
 				</div>
             </div>
         </div>
@@ -38,13 +32,13 @@
             <div class="layui-inline">
             	<label class="layui-form-label">作业成绩</label>
 				<div class="layui-input-inline">
-					<input type="text" id="questionHomeworkScore" name="questionHomeworkScore"  value="${teacherOpenCourseScoreDashboard.questionHomeworkScore}"   class="layui-input" >
+					<input type="number" id="questionHomeworkScore" name="questionHomeworkScore"  value="${teacherOpenCourseScoreDashboard.questionHomeworkScore}"   class="layui-input" >
 				</div>
             </div>
             <div class="layui-inline">
             	<label class="layui-form-label">考试成绩</label>
 				<div class="layui-input-inline">
-					<input type="text" id="examScore" name="examScore"  value="${teacherOpenCourseScoreDashboard.examScore}"   class="layui-input" >
+					<input type="number" id="examScore" name="examScore"  value="${teacherOpenCourseScoreDashboard.examScore}"   class="layui-input" >
 				</div>
             </div>
         </div>
@@ -54,13 +48,13 @@
             <div class="layui-inline">
             	<label class="layui-form-label">互动成绩</label>
 				<div class="layui-input-inline">
-					<input type="text" id="chatScore" name="chatScore"  value="${teacherOpenCourseScoreDashboard.chatScore}"   class="layui-input" >
+					<input type="number" id="chatScore" name="chatScore"  value="${teacherOpenCourseScoreDashboard.chatScore}"   class="layui-input" >
 				</div>
             </div>
             <div class="layui-inline">
             	<label class="layui-form-label">总成绩</label>
 				<div class="layui-input-inline">
-					<input type="text" id="totalScore" name="totalScore"  value="${teacherOpenCourseScoreDashboard.totalScore}"   class="layui-input" >
+					<input type="number" id="totalScore" name="totalScore"  value="${teacherOpenCourseScoreDashboard.totalScore}"   class="layui-input" >
 				</div>
             </div>
         </div>
@@ -70,13 +64,13 @@
             <div class="layui-inline">
             	<label class="layui-form-label">手动调整的分数</label>
 				<div class="layui-input-inline">
-					<input type="text" id="manualScore" name="manualScore"  value="${teacherOpenCourseScoreDashboard.manualScore}"   class="layui-input" >
+					<input type="number" id="manualScore" name="manualScore"  value="${teacherOpenCourseScoreDashboard.manualScore}"   class="layui-input" >
 				</div>
             </div>
             <div class="layui-inline">
             	<label class="layui-form-label">最终成绩</label>
 				<div class="layui-input-inline">
-					<input type="text" id="lastScore" name="lastScore"  value="${teacherOpenCourseScoreDashboard.lastScore}"   class="layui-input" >
+					<input type="number" id="lastScore" name="lastScore"  value="${teacherOpenCourseScoreDashboard.lastScore}"   class="layui-input" >
 				</div>
             </div>
         </div>
@@ -84,33 +78,11 @@
     <div class="layui-row">
         <div class="layui-form-item">
             <div class="layui-inline">
-            	<label class="layui-form-label">成绩状态（保存中文）</label>
+            	<label class="layui-form-label">成绩状态</label>
 				<div class="layui-input-inline">
 					<input type="text" id="lastStatus" name="lastStatus"  value="${teacherOpenCourseScoreDashboard.lastStatus}"   class="layui-input" >
 				</div>
             </div>
-            <div class="layui-inline">
-            	<label class="layui-form-label">组织ID</label>
-				<div class="layui-input-inline">
-					<input type="text" id="orgId" name="orgId"  value="${teacherOpenCourseScoreDashboard.orgId}"   class="layui-input" >
-				</div>
-            </div>
-        </div>
-    </div>
-    <div class="layui-row">
-        <div class="layui-form-item">
-            <div class="layui-inline">
-            	<label class="layui-form-label">用户ID</label>
-				<div class="layui-input-inline">
-					<input type="text" id="userId" name="userId"  value="${teacherOpenCourseScoreDashboard.userId}"   class="layui-input" >
-				</div>
-            </div>
-            <div class="layui-inline">
-            	<label class="layui-form-label">创建时间</label>
-				<div class="layui-input-inline">
-					<input type="text" id="createTime" name="createTime"  value="${teacherOpenCourseScoreDashboard.createTime,"yyyy-MM-dd"}"   class="layui-input input-date" >
-				</div>
-            </div>
         </div>
     </div>
 	<!-- 业务对象须有hidden字段，保存delFlag和version字段-->