diff --git a/doc/sql/mysql/tianze-pro-update.sql b/doc/sql/mysql/tianze-pro-update.sql index ebc1a814..7021bfca 100644 --- a/doc/sql/mysql/tianze-pro-update.sql +++ b/doc/sql/mysql/tianze-pro-update.sql @@ -355,3 +355,7 @@ ALTER TABLE course_info ADD COLUMN order_index bigint(20) COMMENT '同级排序' ALTER TABLE resources_info ADD COLUMN resources_info_files varchar(4000) COMMENT '文件集合'; ALTER TABLE teacher_open_course_merge_resources_info ADD COLUMN resources_info_files varchar(4000) COMMENT '文件集合'; + + +ALTER TABLE teacher_open_course_merge_schedule_session ADD COLUMN teacher_open_course_schedule_session_open_on_holidays tinyint(1) COMMENT '节假日是否排课'; +ALTER TABLE teacher_open_course_merge_schedule_session ADD COLUMN teacher_open_course_schedule_session_class_list varchar(4000) COMMENT '开课节次和班级的组合,JSON格式'; \ No newline at end of file diff --git a/web/src/main/java/com/ibeetl/jlw/dao/UniversitiesCollegesDao.java b/web/src/main/java/com/ibeetl/jlw/dao/UniversitiesCollegesDao.java index f868e7ff..c2a82b78 100644 --- a/web/src/main/java/com/ibeetl/jlw/dao/UniversitiesCollegesDao.java +++ b/web/src/main/java/com/ibeetl/jlw/dao/UniversitiesCollegesDao.java @@ -1,6 +1,7 @@ package com.ibeetl.jlw.dao; import com.ibeetl.jlw.entity.UniversitiesColleges; +import com.ibeetl.jlw.entity.UniversitiesCollegesRuleInfo; import com.ibeetl.jlw.web.query.UniversitiesCollegesQuery; import org.beetl.sql.core.engine.PageQuery; import org.beetl.sql.mapper.BaseMapper; @@ -29,4 +30,11 @@ public interface UniversitiesCollegesDao extends BaseMapperqueryByCondition(PageQuery query){ PageQuery ret = universitiesCollegesDao.queryByCondition(query); @@ -182,4 +187,21 @@ public class UniversitiesCollegesService extends CoreBaseService