排课

admin-core/src/main/java/com/ibeetl/admin/core/conf/CacheConfig.java

@@ -59,6 +59,17 @@ public class CacheConfig {
 	public RedisCacheManager cacheManager1Day(RedisTemplate redisTemplate) {
 		return create(redisTemplate, 3600 * 24L);
 	}
+	/**
+	 * 永不过期的
+	 *
+	 * @Cacheable(value = {"product"},key = "#root.args[0]",cacheManager = "cacheManagerNeverExpire") // 永不过期的
+	 * @param redisTemplate
+	 * @return
+	 */
+	@Bean
+	public RedisCacheManager cacheManagerNeverExpire(RedisTemplate redisTemplate) {
+		return create(redisTemplate, -1L);
+	}
 
 	/**
 	 * 过期时间一小时

admin-core/src/main/resources/static/js/common.js

@@ -179,7 +179,7 @@ var Common = {
                     if (next != null) {
                         next(rsp.data);
                     } else {
-                        Common.success(rsp.responseJSON.msg);
+                        Common.success(rsp.msg || rsp.responseJSON.msg);
                     }
                 }
             },

web/src/main/java/com/ibeetl/jlw/entity/TeacherOpenCourseScheduleSessionOptions.java

@@ -1,5 +1,6 @@
 package com.ibeetl.jlw.entity;
 
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.ibeetl.admin.core.util.ValidateConfig;
 import lombok.Data;
 import lombok.Getter;
@@ -21,6 +22,7 @@ import static org.springframework.format.annotation.DateTimeFormat.ISO.DATE;
 @Data
 @Accessors(chain = true)
 @SuppressWarnings("ALL")
+@JsonIgnoreProperties(ignoreUnknown = true)
 public class TeacherOpenCourseScheduleSessionOptions {
 
     @NotNull(message = "排课配置ID不能为空！", groups =ValidateConfig.UPDATE.class)

web/src/main/java/com/ibeetl/jlw/entity/TeacherOpenCourseScheduleSessionTag.java

@@ -1,5 +1,6 @@
 package com.ibeetl.jlw.entity;
 
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.ibeetl.admin.core.entity.BaseEntity;
 import com.ibeetl.admin.core.util.ValidateConfig;
 import org.beetl.sql.annotation.entity.AssignID;
@@ -11,6 +12,7 @@ import java.util.Date;
 * 课程开课-开课节次-标签
 * gen by Spring Boot2 Admin 2022-09-10
 */
+@JsonIgnoreProperties(ignoreUnknown = true)
 public class TeacherOpenCourseScheduleSessionTag extends BaseEntity{
 
     //课程开课-课次标签ID

web/src/main/resources/static/js/jlw/teacherOpenCourseScheduleSession/add.js

@@ -14,6 +14,12 @@ layui.define(['form', 'laydate', 'table', 'xmSelect', 'teacherOpenCourseSchedule
     classData.forEach(function (item, index) {
         classSelectData[index] = {name: item.className, value: item.classId, selected: false}
     });
+    // 是否多个教室
+    var isMultipleSessionClass = function() {
+        return $("#addForm input:radio[name='teacherOpenCourseScheduleSessionClassIsMultiple']:checked").val()
+    }
+
+    var currentTableCache = function() {return table.cache['kkJieciTable']};
 
     /*班级下拉多选*/
     var demo1 = xmSelect.render({
@@ -145,16 +151,22 @@ layui.define(['form', 'laydate', 'table', 'xmSelect', 'teacherOpenCourseSchedule
     });
 
     form.on('select(select_)', function (obj) {
-        debugger
+        // table.cache['kkJieciTable'][$(this).parents("tr").data("index")].teacherOpenCourseScheduleSessionClassId = obj.value;
-        table.cache['kkJieciTable'][$(this).parents("tr").data("index")].teacherOpenCourseScheduleSessionClassId = obj.value;
+        // var teacherOpenCourseScheduleSessionClassIsMultiple = $("#addForm input:radio[name='teacherOpenCourseScheduleSessionClassIsMultiple']:checked").val();
-        var teacherOpenCourseScheduleSessionClassIsMultiple = $("#addForm input:radio[name='teacherOpenCourseScheduleSessionClassIsMultiple']:checked").val();
         // if (teacherOpenCourseScheduleSessionClassIsMultiple == 'false') {
-            kkJieciTableData.forEach(function (item, index) {
+        //     kkJieciTableData.forEach(function (item, index) {
-                if(item.LAY_CHECKED === true) {
+        //         item.teacherOpenCourseScheduleSessionClassId = obj.value;
+        //     });
+        // }
+        if(isMultipleSessionClass() === 'false') {
+            currentTableCache().forEach(function (item, index) {
+                if (item.LAY_CHECKED === true) {
                     item.teacherOpenCourseScheduleSessionClassId = obj.value;
                 }
             });
-        // }
+        }else {
+            currentTableCache()[$(this).parents("tr").data("index")].teacherOpenCourseScheduleSessionClassId = obj.value;
+        }
     });
     //设置时间弹窗
     $("#setTime").click(function () {
@@ -378,13 +390,13 @@ layui.define(['form', 'laydate', 'table', 'xmSelect', 'teacherOpenCourseSchedule
 
                 // 构建后台所需要的开课节次List数据
                 var sessionTagListMap = {};
-                kkJieciTableData.forEach(item => {
+                currentTableCache().forEach(item => {
                     var sessionClassId = item.teacherOpenCourseScheduleSessionClassId
                     if(!sessionClassId) { return; }
                     if(sessionTagListMap.hasOwnProperty(sessionClassId)) {
                         sessionTagListMap[sessionClassId].push(item)
                     }else {
-                        sessionTagListMap[sessionClassId] = []
+                        (sessionTagListMap[sessionClassId] = []).push(item)
                     }
                 })
                 var param = {
@@ -392,8 +404,8 @@ layui.define(['form', 'laydate', 'table', 'xmSelect', 'teacherOpenCourseSchedule
                     teacherOpenCourseId: teacherOpenCourseId,
                     teacherId: teacherId,
                     schoolClassIdPlural: schoolClassIds,
-                    teacherOpenCourseScheduleSessionClassIsMultiple: teacherOpenCourseScheduleSessionClassIsMultiple,
+                    // teacherOpenCourseScheduleSessionClassIsMultiple: teacherOpenCourseScheduleSessionClassIsMultiple,
-                    sessionTagList: sessionTagListMap,
+                    sessionClassList: sessionTagListMap,
                     startTime: teacherOpenCourseScheduleSessionDayTime,
                     weekNum: teacherOpenCourseScheduleSessionWeekNum,
                     openOnHolidays: teacherOpenCourseScheduleSessionOpenOnHolidays,