Merge remote-tracking branch 'origin/beetlsql3-dev' into beetlsql3-dev

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

@@ -96,8 +96,10 @@ public class StatisticalAnalysisService {
                     "不及格".equals(v.getLastStatus()) || "E".equals(v.getLastStatus())).count();
             long l = scoreDashboards.size() - count1;
             data.put("passRate", NumberUtil.formatPercent(NumberUtil.div(l,scoreDashboards.size()), 0));
+            data.put("studentPassNum",l );
         }else {
             data.put("passRate", "0%");
+            data.put("studentPassNum", 0);
         }
         //授课视频
         TeacherOpenCourseMergeCourseInfoQuery courseInfoQuery = new TeacherOpenCourseMergeCourseInfoQuery();

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

@@ -232,6 +232,7 @@ public class TeacherOpenCourseNoticeService extends CoreBaseService<TeacherOpenC
             TeacherOpenCourseNoticeQuery noticeQuery = new TeacherOpenCourseNoticeQuery();
             noticeQuery.setTeacherOpenCourseIds(teacherOpenCourseId+"");
             noticeQuery.setSchoolClassIds(classId+"");
+            noticeQuery.setDelFlag(0);
             List<TeacherOpenCourseNotice> noticeList = teacherOpenCourseNoticeDao.getValuesByQueryNotWithPermission(noticeQuery);
             if (CollectionUtil.isEmpty(noticeList)) {
                 return JsonResult.success(0);

web/src/main/resources/sql/jlw/teacherOpenCourseStudentSigninLog.md

@@ -97,7 +97,7 @@ queryByConditionQuery
   and find_in_set(t.teacher_open_course_student_signin_setting_id,#teacherOpenCourseStudentSigninSettingIdPlural#)
   @}
   @if(!isEmpty(teacherOpenCourseStudentSigninSettingSessionTime)){
-  and t.teacher_open_course_student_signin_setting_session_time =#teacherOpenCourseStudentSigninSettingSessionTime#
+  and SUBSTRING(t.teacher_open_course_student_signin_setting_session_time,1,10) =#teacherOpenCourseStudentSigninSettingSessionTime#
   @}
   @if(!isEmpty(studentId)){
   and t.student_id =#studentId#

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

@@ -74,7 +74,8 @@
             <div class="layui-inline">
             <label class="layui-form-label"><span class="req">*</span>班级名称：</label>
 				<div class="layui-input-inline">
-					<input type="text" name="className" value="${schoolClass.className}" class="layui-input" lay-verify="required">
+					<input type="text" name="className" value="${schoolClass.className}" class="layui-input" lay-verify="required"
+                           onkeyup="this.value=this.value.replace(/：|:|-/g,'')" onafterpaste="this.value=this.value.replace(/：|:|-/g,'')">
 				</div>
             </div>
         </div>

web/src/main/resources/templates/jlw/teacher/importPage.html

@@ -138,7 +138,7 @@
         });
 
         $("#addButton").click(function(){
-
+            Lib.closeFrame();
         });
 
         $("#addButton-cancel").click(function(){

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

@@ -11,7 +11,8 @@
             <div class="layui-inline">
                 <label class="layui-form-label"><span class="req">*</span>院校名称：</label>
 				<div class="layui-input-inline">
-					<input type="text" name="universitiesCollegesName" value="${universitiesColleges.universitiesCollegesName}" class="layui-input" lay-verify="required">
+					<input type="text" name="universitiesCollegesName" value="${universitiesColleges.universitiesCollegesName}" class="layui-input" lay-verify="required"
+                           onkeyup="this.value=this.value.replace(/：|:|-/g,'')" onafterpaste="this.value=this.value.replace(/：|:|-/g,'')">
 				</div>
             </div>
             <div class="layui-inline">

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

@@ -52,7 +52,7 @@
         </div>
     </div>
     <div class="layui-row">
-        <table class="layui-table">
+        <table class="layui-table" id="syTable">
             <colgroup>
                 <col width="80">
                 <col width="300">
@@ -78,7 +78,7 @@
                 {{#  layui.each(d.list, function(index, item){ }}
                 <tr index="{{index}}">
                     <td><input type="checkbox" name="xt_id" {{item.useType !=null && item.useType !=0?'checked':''}}
-                               lay-skin="primary" lay-filter="select_xt"></td>
+                               lay-skin="primary" lay-filter="select_xt" value="{{item.typeId}}"></td>
                     <td>{{item.applicationName}}</td>
                     <td>
                         <select name="useType" lay-filter="select_useType_1">
@@ -276,8 +276,11 @@
 
         //加载课程数据
         function loadkcInfo() {
-            var ret = Common.getAjax("/jlw/universitiesCollegesJurisdictionCurriculumResources/getAllByQuery.json", {
-                universitiesCollegesId: $("select[name='universitiesCollegesId']").val() || onUniversitiesCollegesId
+            var typeIds = '';
+            $("input[name='xt_id']:checked").each(function (obj) {typeIds += obj+',';});
+            var ret = Common.getAjax("/jlw/resourcesApplicationCourse/getAllByApplicationIds.json", {
+                universitiesCollegesId: $("select[name='universitiesCollegesId']").val() || onUniversitiesCollegesId,
+                applicationIds:typeIds.substring(0,typeIds.length-1)
             });//获取课程系统
             kcList = ret.data;
             loadujr(kcList);
@@ -316,6 +319,9 @@
                     } else {
                         $("input[name='allSelect_1']").prop("checked", false);
                     }
+
+                    loadkcInfo();
+
                     form.render();
                 });
 
@@ -419,6 +425,10 @@
             });
         }
 
+        //选择授权院校
+        form.on('select(select_universitiesColleges)', function (obj) {
+            loadkcInfo();
+        });
 
         //切换使用级别
         form.on('select(select_useType_1)', function (obj) {

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

@@ -20,6 +20,7 @@
             <label class="layui-form-label">院系名称</label>
             <div class="layui-input-inline">
                 <input type="text" id="universityFacultyName" name="universityFacultyName"
+                       onkeyup="this.value=this.value.replace(/：|:|-/g,'')" onafterpaste="this.value=this.value.replace(/：|:|-/g,'')"
                        value="${universityFaculty.universityFacultyName!''}" class="layui-input">
             </div>
         </div>

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

@@ -31,6 +31,7 @@
             <label class="layui-form-label">专业名称</label>
             <div class="layui-input-inline">
                 <input type="text" id="universitySystemName" name="universitySystemName"
+                       onkeyup="this.value=this.value.replace(/：|:|-/g,'')" onafterpaste="this.value=this.value.replace(/：|:|-/g,'')"
                        value="${universitySystem.universitySystemName}" class="layui-input">
             </div>
         </div>