开课关联排课配置

doc/sql/mysql/tianze-pro-update.sql

@@ -297,4 +297,27 @@ CREATE TABLE `teacher_open_course_hands_on_simulation_tasks_file` (
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='教师开课-课程实操-实训任务附件表';
 
 
-ALTER TABLE teacher_open_course_schedule_session ADD  COLUMN teacher_open_course_schedule_session_status_week_detail varchar(100) COMMENT '开课星期 多个逗号隔开 枚举WeekDetailType';
+ALTER TABLE teacher_open_course_schedule_session ADD  COLUMN teacher_open_course_schedule_session_status_week_detail varchar(100) COMMENT '开课星期 多个逗号隔开 枚举WeekDetailType';
+
+drop table if exists teacher_open_course_merge_schedule_session;
+
+/*==============================================================*/
+/* Table: teacher_open_course_merge_schedule_session            */
+/*==============================================================*/
+create table teacher_open_course_merge_schedule_session
+(
+    teacher_open_course_merge_schedule_session_id bigint not null comment '课程开课-班级-排课配置-关联ID',
+    teacher_open_course_id bigint comment '开课ID',
+    teacher_open_course_schedule_session_id bigint comment '课程排课配置ID',
+    teacher_open_course_merge_schedule_session_add_time datetime comment '添加时间',
+    teacher_open_course_merge_schedule_session_status int(2) comment '状态',
+    org_id               bigint comment '组织ID',
+    user_id              bigint comment '用户ID',
+    primary key (teacher_open_course_merge_schedule_session_id)
+)
+    auto_increment = 1
+    ENGINE = InnoDB
+    DEFAULT CHARACTER SET = utf8
+    COLLATE = utf8_general_ci;
+
+alter table teacher_open_course_merge_schedule_session comment '课程开课-关联-排课配置';

web/src/main/java/com/ibeetl/jlw/dao/TeacherOpenCourseMergeScheduleSessionDao.java

@@ -0,0 +1,28 @@
+package com.ibeetl.jlw.dao;
+
+import com.ibeetl.jlw.entity.TeacherOpenCourseMergeScheduleSession;
+import com.ibeetl.jlw.web.query.TeacherOpenCourseMergeScheduleSessionQuery;
+import org.beetl.sql.core.engine.PageQuery;
+import org.beetl.sql.mapper.BaseMapper;
+import org.beetl.sql.mapper.annotation.SqlResource;
+import org.beetl.sql.mapper.annotation.Update;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 开课关联排课配置 Dao
+ */
+@SqlResource("jlw.teacherOpenCourseMergeScheduleSession")
+public interface TeacherOpenCourseMergeScheduleSessionDao extends BaseMapper<TeacherOpenCourseMergeScheduleSession>{
+    PageQuery<TeacherOpenCourseMergeScheduleSession> queryByCondition(PageQuery query);
+    PageQuery<TeacherOpenCourseMergeScheduleSession> queryByConditionQuery(PageQuery query);
+    @Update
+    void deleteTeacherOpenCourseMergeScheduleSessionByIds(String ids);
+    @Update
+    int updateGivenByIds(TeacherOpenCourseMergeScheduleSessionQuery teacherOpenCourseMergeScheduleSessionQuery);
+    List<TeacherOpenCourseMergeScheduleSession> getByIds(String ids);
+    List<TeacherOpenCourseMergeScheduleSession> getValuesByQuery(TeacherOpenCourseMergeScheduleSessionQuery teacherOpenCourseMergeScheduleSessionQuery);
+    List<TeacherOpenCourseMergeScheduleSession> getValuesByQueryNotWithPermission(TeacherOpenCourseMergeScheduleSessionQuery teacherOpenCourseMergeScheduleSessionQuery);
+    List<Map<String,Object>>getExcelValues(TeacherOpenCourseMergeScheduleSessionQuery teacherOpenCourseMergeScheduleSessionQuery);
+}

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

@@ -0,0 +1,164 @@
+package com.ibeetl.jlw.entity;
+
+import com.ibeetl.admin.core.annotation.Dict;
+import com.ibeetl.admin.core.annotation.DictDeep;
+import com.ibeetl.admin.core.entity.BaseEntity;
+import com.ibeetl.admin.core.util.ValidateConfig;
+import org.beetl.sql.annotation.entity.AssignID;
+import org.beetl.sql.annotation.entity.InsertIgnore;
+import org.beetl.sql.annotation.entity.UpdateIgnore;
+import org.beetl.sql.fetch.annotation.Fetch;
+import org.beetl.sql.fetch.annotation.FetchOne;
+
+import javax.validation.constraints.NotNull;
+import java.util.Date;
+
+/* 
+* 课程开课-关联-排课配置
+* gen by Spring Boot2 Admin 2022-10-30
+*/
+@Fetch(level = 2)
+public class TeacherOpenCourseMergeScheduleSession extends BaseEntity{
+
+    //课程开课-班级-排课配置-关联ID
+    @NotNull(message = "ID不能为空", groups =ValidateConfig.UPDATE.class)
+    // @SeqID(name = ORACLE_CORE_SEQ_NAME)
+    @AssignID(value = "maskAutoID",param = "com.ibeetl.jlw.entity.TeacherOpenCourseMergeScheduleSession")
+
+    private Long teacherOpenCourseMergeScheduleSessionId ;
+	
+    //开课ID
+    @Dict(type="teacher_open_course.teacher_open_course_title.teacher_open_course_status=1")
+
+    private Long teacherOpenCourseId ;
+	
+    //课程排课配置ID
+
+    private Long teacherOpenCourseScheduleSessionId ;
+
+    @FetchOne("teacherOpenCourseScheduleSessionId")
+    @DictDeep
+    @UpdateIgnore
+    @InsertIgnore
+    private TeacherOpenCourseScheduleSession teacherOpenCourseScheduleSession;
+	
+    //添加时间
+
+    private Date teacherOpenCourseMergeScheduleSessionAddTime ;
+	
+    //状态
+    @Dict(type="global_status")
+
+    private Integer teacherOpenCourseMergeScheduleSessionStatus ;
+	
+    //组织ID
+
+    private Long orgId ;
+	
+    //用户ID
+
+    private Long userId ;
+	
+    public TeacherOpenCourseMergeScheduleSession(){
+    }
+
+    /**课程开课-班级-排课配置-关联ID
+    *@return 
+    */
+    public Long getTeacherOpenCourseMergeScheduleSessionId(){
+        return  teacherOpenCourseMergeScheduleSessionId;
+    }
+    /**课程开课-班级-排课配置-关联ID
+    *@param  teacherOpenCourseMergeScheduleSessionId
+    */
+    public void setTeacherOpenCourseMergeScheduleSessionId(Long teacherOpenCourseMergeScheduleSessionId){
+        this.teacherOpenCourseMergeScheduleSessionId = teacherOpenCourseMergeScheduleSessionId;
+    }
+
+    /**开课ID
+    *@return 
+    */
+    public Long getTeacherOpenCourseId(){
+        return  teacherOpenCourseId;
+    }
+    /**开课ID
+    *@param  teacherOpenCourseId
+    */
+    public void setTeacherOpenCourseId(Long teacherOpenCourseId){
+        this.teacherOpenCourseId = teacherOpenCourseId;
+    }
+
+    /**课程排课配置ID
+    *@return 
+    */
+    public Long getTeacherOpenCourseScheduleSessionId(){
+        return  teacherOpenCourseScheduleSessionId;
+    }
+    /**课程排课配置ID
+    *@param  teacherOpenCourseScheduleSessionId
+    */
+    public void setTeacherOpenCourseScheduleSessionId(Long teacherOpenCourseScheduleSessionId){
+        this.teacherOpenCourseScheduleSessionId = teacherOpenCourseScheduleSessionId;
+    }
+
+    /**添加时间
+    *@return 
+    */
+    public Date getTeacherOpenCourseMergeScheduleSessionAddTime(){
+        return  teacherOpenCourseMergeScheduleSessionAddTime;
+    }
+    /**添加时间
+    *@param  teacherOpenCourseMergeScheduleSessionAddTime
+    */
+    public void setTeacherOpenCourseMergeScheduleSessionAddTime(Date teacherOpenCourseMergeScheduleSessionAddTime){
+        this.teacherOpenCourseMergeScheduleSessionAddTime = teacherOpenCourseMergeScheduleSessionAddTime;
+    }
+
+    /**状态
+    *@return 
+    */
+    public Integer getTeacherOpenCourseMergeScheduleSessionStatus(){
+        return  teacherOpenCourseMergeScheduleSessionStatus;
+    }
+    /**状态
+    *@param  teacherOpenCourseMergeScheduleSessionStatus
+    */
+    public void setTeacherOpenCourseMergeScheduleSessionStatus(Integer teacherOpenCourseMergeScheduleSessionStatus){
+        this.teacherOpenCourseMergeScheduleSessionStatus = teacherOpenCourseMergeScheduleSessionStatus;
+    }
+
+    /**组织ID
+    *@return 
+    */
+    public Long getOrgId(){
+        return  orgId;
+    }
+    /**组织ID
+    *@param  orgId
+    */
+    public void setOrgId(Long orgId){
+        this.orgId = orgId;
+    }
+
+    /**用户ID
+    *@return 
+    */
+    public Long getUserId(){
+        return  userId;
+    }
+    /**用户ID
+    *@param  userId
+    */
+    public void setUserId(Long userId){
+        this.userId = userId;
+    }
+
+
+    public TeacherOpenCourseScheduleSession getTeacherOpenCourseScheduleSession() {
+        return teacherOpenCourseScheduleSession;
+    }
+
+    public void setTeacherOpenCourseScheduleSession(TeacherOpenCourseScheduleSession teacherOpenCourseScheduleSession) {
+        this.teacherOpenCourseScheduleSession = teacherOpenCourseScheduleSession;
+    }
+}

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

@@ -0,0 +1,291 @@
+package com.ibeetl.jlw.service;
+
+import cn.jlw.util.ToolUtils;
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
+import com.ibeetl.admin.core.entity.CoreUser;
+import com.ibeetl.admin.core.service.CoreBaseService;
+import com.ibeetl.admin.core.util.PlatformException;
+import com.ibeetl.admin.core.web.JsonResult;
+import com.ibeetl.admin.core.web.JsonReturnCode;
+import com.ibeetl.jlw.dao.TeacherOpenCourseMergeScheduleSessionDao;
+import com.ibeetl.jlw.entity.FileEntity;
+import com.ibeetl.jlw.entity.TeacherOpenCourseMergeScheduleSession;
+import com.ibeetl.jlw.web.query.TeacherOpenCourseMergeScheduleSessionQuery;
+import org.apache.commons.lang3.StringUtils;
+import org.apache.poi.hssf.usermodel.HSSFWorkbook;
+import org.apache.poi.ss.usermodel.Row;
+import org.apache.poi.ss.usermodel.Sheet;
+import org.apache.poi.ss.usermodel.Workbook;
+import org.apache.poi.xssf.usermodel.XSSFWorkbook;
+import org.beetl.sql.core.SqlId;
+import org.beetl.sql.core.engine.PageQuery;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.validation.annotation.Validated;
+
+import java.io.*;
+import java.util.*;
+
+import static com.ibeetl.admin.core.util.ExcelUtil.getCellFormatValue;
+
+/**
+ * 开课关联排课配置 Service
+ * 当分布式ID开启后请勿使用insert(*,true)
+ */
+
+@Service
+@Transactional
+@Validated
+public class TeacherOpenCourseMergeScheduleSessionService extends CoreBaseService<TeacherOpenCourseMergeScheduleSession>{
+
+    @Autowired private TeacherOpenCourseMergeScheduleSessionDao teacherOpenCourseMergeScheduleSessionDao;
+
+    public PageQuery<TeacherOpenCourseMergeScheduleSession>queryByCondition(PageQuery query){
+        PageQuery ret =  teacherOpenCourseMergeScheduleSessionDao.queryByCondition(query);
+        queryListAfter(ret.getList());
+        return ret;
+    }
+
+    public PageQuery<TeacherOpenCourseMergeScheduleSession>queryByConditionQuery(PageQuery query){
+        PageQuery ret =  teacherOpenCourseMergeScheduleSessionDao.queryByConditionQuery(query);
+        queryListAfter(ret.getList());
+        return ret;
+    }
+
+    public void deleteByList(List list){
+        String ids = "";
+        ToolUtils.deleteNullList(list);
+        for(int i=0;null != list && i<list.size();i++){
+            ids += list.get(i).toString()+(i==list.size()-1?"":",");
+        }
+        if(StringUtils.isNotBlank(ids)){
+            teacherOpenCourseMergeScheduleSessionDao.deleteTeacherOpenCourseMergeScheduleSessionByIds(ids);
+        }
+    }
+
+    public void deleteTeacherOpenCourseMergeScheduleSession(String ids){
+        try {
+            teacherOpenCourseMergeScheduleSessionDao.deleteTeacherOpenCourseMergeScheduleSessionByIds(ids);
+        } catch (Exception e) {
+            throw new PlatformException("批量删除开课关联排课配置失败", e);
+        }
+    }
+
+    public String addAll(TeacherOpenCourseMergeScheduleSessionQuery teacherOpenCourseMergeScheduleSessionQuery){
+        String msg = "";
+        List<TeacherOpenCourseMergeScheduleSession> teacherOpenCourseMergeScheduleSessionList = new ArrayList<>();
+        try {
+            teacherOpenCourseMergeScheduleSessionList = JSON.parseArray(teacherOpenCourseMergeScheduleSessionQuery.getTeacherOpenCourseMergeScheduleSessionJsonStr(), TeacherOpenCourseMergeScheduleSession.class);
+        } catch (Exception e) {
+            try {
+                teacherOpenCourseMergeScheduleSessionList.add(JSONObject.parseObject(teacherOpenCourseMergeScheduleSessionQuery.getTeacherOpenCourseMergeScheduleSessionJsonStr(), TeacherOpenCourseMergeScheduleSession.class));
+            } catch (Exception e1) {}
+        }
+        ToolUtils.deleteNullList(teacherOpenCourseMergeScheduleSessionList);
+        if(null != teacherOpenCourseMergeScheduleSessionList && teacherOpenCourseMergeScheduleSessionList.size()>0){
+            for(int i=0;i<teacherOpenCourseMergeScheduleSessionList.size();i++){
+                TeacherOpenCourseMergeScheduleSession teacherOpenCourseMergeScheduleSession = teacherOpenCourseMergeScheduleSessionList.get(i);
+                teacherOpenCourseMergeScheduleSession.setTeacherOpenCourseMergeScheduleSessionAddTime(teacherOpenCourseMergeScheduleSessionQuery.getTeacherOpenCourseMergeScheduleSessionAddTime());
+                teacherOpenCourseMergeScheduleSession.setUserId(teacherOpenCourseMergeScheduleSessionQuery.getUserId());
+                teacherOpenCourseMergeScheduleSession.setOrgId(teacherOpenCourseMergeScheduleSessionQuery.getOrgId());
+            }
+            insertBatch(teacherOpenCourseMergeScheduleSessionList);
+        }
+        return msg;
+    }
+
+    public JsonResult add(TeacherOpenCourseMergeScheduleSessionQuery teacherOpenCourseMergeScheduleSessionQuery){
+        String msg = "";
+        TeacherOpenCourseMergeScheduleSession teacherOpenCourseMergeScheduleSession = teacherOpenCourseMergeScheduleSessionQuery.pojo();
+        teacherOpenCourseMergeScheduleSession.setTeacherOpenCourseMergeScheduleSessionAddTime(new Date());
+        teacherOpenCourseMergeScheduleSessionDao.insert(teacherOpenCourseMergeScheduleSession);
+        teacherOpenCourseMergeScheduleSessionQuery.setTeacherOpenCourseMergeScheduleSessionId(teacherOpenCourseMergeScheduleSession.getTeacherOpenCourseMergeScheduleSessionId());
+        JsonResult jsonResult = new JsonResult();
+        jsonResult.setData(teacherOpenCourseMergeScheduleSession.getTeacherOpenCourseMergeScheduleSessionId());//自增的ID丢进去
+        jsonResult.setCode(JsonReturnCode.SUCCESS.getCode());
+        jsonResult.setMsg(msg);
+        return jsonResult;
+    }
+
+    public String edit(TeacherOpenCourseMergeScheduleSessionQuery teacherOpenCourseMergeScheduleSessionQuery){
+        String msg = "";
+        TeacherOpenCourseMergeScheduleSession teacherOpenCourseMergeScheduleSession = teacherOpenCourseMergeScheduleSessionQuery.pojo();
+        teacherOpenCourseMergeScheduleSessionDao.updateTemplateById(teacherOpenCourseMergeScheduleSession);
+        return msg;
+    }
+
+    public String updateGivenByIds(TeacherOpenCourseMergeScheduleSessionQuery teacherOpenCourseMergeScheduleSessionQuery){
+        String msg = "";
+        if(StringUtils.isNotBlank(teacherOpenCourseMergeScheduleSessionQuery.get_given())){
+            boolean flag = teacherOpenCourseMergeScheduleSessionDao.updateGivenByIds(teacherOpenCourseMergeScheduleSessionQuery) > 0;
+            if(!flag){
+                msg = "更新指定参数失败";
+            }
+        }else{
+            msg = "指定参数为空";
+        }
+        return msg;
+    }
+
+    public List<TeacherOpenCourseMergeScheduleSession> getValues (Object paras){
+        return sqlManager.select(SqlId.of("jlw.teacherOpenCourseMergeScheduleSession.getTeacherOpenCourseMergeScheduleSessionValues"), TeacherOpenCourseMergeScheduleSession.class, paras);
+    }
+
+    public List<TeacherOpenCourseMergeScheduleSession> getValuesByQuery (TeacherOpenCourseMergeScheduleSessionQuery teacherOpenCourseMergeScheduleSessionQuery){
+        return teacherOpenCourseMergeScheduleSessionDao.getValuesByQuery(teacherOpenCourseMergeScheduleSessionQuery);
+    }
+
+    public List<TeacherOpenCourseMergeScheduleSession> getValuesByQueryNotWithPermission (TeacherOpenCourseMergeScheduleSessionQuery teacherOpenCourseMergeScheduleSessionQuery){
+        return teacherOpenCourseMergeScheduleSessionDao.getValuesByQueryNotWithPermission(teacherOpenCourseMergeScheduleSessionQuery);
+    }
+
+    public TeacherOpenCourseMergeScheduleSession getInfo (Long teacherOpenCourseMergeScheduleSessionId){
+        TeacherOpenCourseMergeScheduleSessionQuery teacherOpenCourseMergeScheduleSessionQuery = new TeacherOpenCourseMergeScheduleSessionQuery();
+        teacherOpenCourseMergeScheduleSessionQuery.setTeacherOpenCourseMergeScheduleSessionId(teacherOpenCourseMergeScheduleSessionId);
+        List<TeacherOpenCourseMergeScheduleSession> list = teacherOpenCourseMergeScheduleSessionDao.getValuesByQuery(teacherOpenCourseMergeScheduleSessionQuery);
+        if(null != list && list.size()>0){
+            return list.get(0);
+        }else{
+            return null;
+        }
+    }
+
+    public TeacherOpenCourseMergeScheduleSession getInfo (TeacherOpenCourseMergeScheduleSessionQuery teacherOpenCourseMergeScheduleSessionQuery){
+        List<TeacherOpenCourseMergeScheduleSession> list = teacherOpenCourseMergeScheduleSessionDao.getValuesByQuery(teacherOpenCourseMergeScheduleSessionQuery);
+        if(null != list && list.size()>0){
+            return list.get(0);
+        }else{
+            return null;
+        }
+    }
+
+
+    public JsonResult importTemplate(List<FileEntity> fileEntityList,List<Long>list,CoreUser coreUser){
+        List<String[]>errMsg = new ArrayList<>();
+        String msg ="";
+        int count = 0;
+        Date date = new Date();
+        for(int item=0;null != fileEntityList && item<fileEntityList.size();item++){
+            FileEntity fileEntity = fileEntityList.get(item);
+            if(null != fileEntity){
+                File file = new File(fileEntity.getAbsoluteUrl());
+                if(file.exists() && file.isFile() && file.canRead() && ToolUtils.findInSet("xls,xlsx",fileEntity.getFormat())){
+                    Workbook wb = null;
+                    InputStream is = null;
+                    try {
+                        is = new FileInputStream(fileEntity.getAbsoluteUrl());
+                        if("xls".equals(fileEntity.getFormat())){
+                            wb = new HSSFWorkbook(is);
+                        }else if("xlsx".equals(fileEntity.getFormat())){
+                            wb = new XSSFWorkbook(is);
+                        }
+                    } catch (FileNotFoundException e) {
+                        e.printStackTrace();
+                    } catch (IOException e) {
+                        e.printStackTrace();
+                    }
+                    try {
+                        if(null != is){
+                        is.close();
+                    }
+                    }catch (Exception e){
+                        e.printStackTrace();
+                    }
+                    if(wb != null){
+                        //获取Sheet1
+                        Sheet sheet = wb.getSheet("Sheet1");
+                        //获取最大行数
+                        int rowNum = sheet.getPhysicalNumberOfRows();
+                        //获取第一行
+                        Row firstRow = sheet.getRow(0);
+                        //获取最大列数
+                        int colNum = firstRow.getPhysicalNumberOfCells();
+
+                        String columns[] = {
+                                        "开课",
+                                        "课程排课配置",
+                                        "状态",
+                        };
+
+                        Map<String,Integer> map = new HashMap<>();//获取需要的表头的列
+
+                        //从第一列找到需要的表头
+                        for (int i=0; i<colNum; i++){
+                            String cellData = getCellFormatValue(firstRow.getCell(i));
+                            for(int j=0;j<columns.length;j++){
+                                if(columns[j].equals(cellData)){
+                                    map.put(columns[j],i);
+                                }
+                            }
+                        }
+
+                        //验证所需要的表头是否全
+                        Integer flag = 0;
+                        for(int i=0;i<columns.length;i++){
+                            if(null != map.get(columns[i])){
+                                flag ++;
+                            }
+                        }
+                        if(flag != columns.length){
+                            String str = " ";
+                            for(int i=0;i<columns.length;i++){
+                                str += "\""+columns[i]+"\""+(i == columns.length-1?"":", ");
+                            }
+                            return JsonResult.failMessage("导入失败，表格表头应包含"+str);
+                        }
+
+                        for (int i = 1; i<rowNum; i++) {
+                            Row row = sheet.getRow(i);
+                            if(null == row){
+                                errMsg.add(new String[]{"第"+(i+1)+"数据为空"});
+                                continue;
+                            }
+
+                            String teacherOpenCourseId = getCellFormatValue(row.getCell(map.get(columns[0])));
+                            String teacherOpenCourseScheduleSessionId = getCellFormatValue(row.getCell(map.get(columns[1])));
+                            String teacherOpenCourseMergeScheduleSessionStatus = getCellFormatValue(row.getCell(map.get(columns[2])));
+                            //TODO 判断（如重复等复杂判断要额外写）
+                            if(StringUtils.isBlank(teacherOpenCourseId)){
+                                errMsg.add(new String[]{"第"+ToolUtils.numberToLetter(map.get(columns[0])+1)+"列，第"+(i+1)+"行开课为空"});
+                                continue;
+                            }else
+                            if(StringUtils.isBlank(teacherOpenCourseScheduleSessionId)){
+                                errMsg.add(new String[]{"第"+ToolUtils.numberToLetter(map.get(columns[1])+1)+"列，第"+(i+1)+"行课程排课配置为空"});
+                                continue;
+                            }else
+                            if(StringUtils.isBlank(teacherOpenCourseMergeScheduleSessionStatus)){
+                                errMsg.add(new String[]{"第"+ToolUtils.numberToLetter(map.get(columns[2])+1)+"列，第"+(i+1)+"行状态为空"});
+                                continue;
+                            }else
+                            {
+                            //TODO 保存
+                            TeacherOpenCourseMergeScheduleSession teacherOpenCourseMergeScheduleSession = new TeacherOpenCourseMergeScheduleSession();
+                            teacherOpenCourseMergeScheduleSession.setTeacherOpenCourseId(Long.parseLong(teacherOpenCourseId));
+                            teacherOpenCourseMergeScheduleSession.setTeacherOpenCourseScheduleSessionId(Long.parseLong(teacherOpenCourseScheduleSessionId));
+                            teacherOpenCourseMergeScheduleSession.setTeacherOpenCourseMergeScheduleSessionAddTime(new Date());
+                            teacherOpenCourseMergeScheduleSession.setTeacherOpenCourseMergeScheduleSessionStatus(Integer.parseInt(teacherOpenCourseMergeScheduleSessionStatus));
+                            teacherOpenCourseMergeScheduleSession.setOrgId(coreUser.getOrgId());
+                            teacherOpenCourseMergeScheduleSession.setUserId(coreUser.getId());
+
+                            count++;
+                            }
+                        }
+                    }
+                }
+            }
+        }
+        JsonResult jsonResult = new JsonResult();
+        jsonResult.setCode(count>0?JsonReturnCode.SUCCESS.getCode():JsonReturnCode.FAIL.getCode());
+        jsonResult.setData(errMsg);
+        jsonResult.setMsg((count>0?"导入成功,共导入"+count+"条":"导入失败")+(StringUtils.isNotBlank(msg)?"<br>"+msg:""));
+        return jsonResult;
+    }
+
+    public List<Map<String,Object>> getExcelValues (TeacherOpenCourseMergeScheduleSessionQuery teacherOpenCourseMergeScheduleSessionQuery){
+        return teacherOpenCourseMergeScheduleSessionDao.getExcelValues(teacherOpenCourseMergeScheduleSessionQuery);
+    }
+
+
+}

web/src/main/java/com/ibeetl/jlw/web/TeacherOpenCourseMergeScheduleSessionController.java

@@ -0,0 +1,419 @@
+package com.ibeetl.jlw.web;
+
+import cn.jlw.Interceptor.GetFile;
+import cn.jlw.Interceptor.RFile;
+import cn.jlw.Interceptor.SCoreUser;
+import cn.jlw.util.ToolUtils;
+import cn.jlw.validate.ValidateConfig;
+import com.ibeetl.admin.core.annotation.Function;
+import com.ibeetl.admin.core.entity.CoreUser;
+import com.ibeetl.admin.core.file.FileService;
+import com.ibeetl.admin.core.util.TimeTool;
+import com.ibeetl.admin.core.web.JsonResult;
+import com.ibeetl.jlw.entity.FileEntity;
+import com.ibeetl.jlw.entity.TeacherOpenCourseMergeScheduleSession;
+import com.ibeetl.jlw.service.TeacherOpenCourseMergeScheduleSessionService;
+import com.ibeetl.jlw.web.query.TeacherOpenCourseMergeScheduleSessionQuery;
+import org.apache.commons.lang3.StringUtils;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.apache.poi.hssf.usermodel.*;
+import org.apache.poi.ss.usermodel.HorizontalAlignment;
+import org.apache.poi.ss.usermodel.VerticalAlignment;
+import org.apache.poi.xssf.usermodel.XSSFWorkbook;
+import org.beetl.sql.core.engine.PageQuery;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.BindingResult;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.ResponseBody;
+import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.servlet.ModelAndView;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.InputStream;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 开课关联排课配置 课程开课-关联-排课配置 接口
+ * 切记不要对非线程安全的静态变量进行写操作
+ */
+
+@RestController
+@Validated
+public class TeacherOpenCourseMergeScheduleSessionController{
+
+    private final Log log = LogFactory.getLog(this.getClass());
+    private static final String MODEL = "/jlw/teacherOpenCourseMergeScheduleSession";
+    private static final String API = "/api/teacherOpenCourseMergeScheduleSession";
+
+
+    @Autowired private TeacherOpenCourseMergeScheduleSessionService teacherOpenCourseMergeScheduleSessionService;
+
+    @Autowired FileService fileService;
+
+    /* 前端接口 */
+
+    @PostMapping(API + "/getPageList.do")
+    public JsonResult<PageQuery> getPageList(TeacherOpenCourseMergeScheduleSessionQuery condition,@SCoreUser CoreUser coreUser){
+        if(null == coreUser){
+            return JsonResult.failMessage("请登录后再操作");
+        }else{
+            PageQuery page = condition.getPageQuery();
+            teacherOpenCourseMergeScheduleSessionService.queryByConditionQuery(page);
+            return JsonResult.success(page);
+        }
+    }
+
+
+    @GetMapping(API + "/getInfo.do")
+    public JsonResult<TeacherOpenCourseMergeScheduleSession>getInfo(TeacherOpenCourseMergeScheduleSessionQuery param,@SCoreUser CoreUser coreUser) {
+        if(null == coreUser){
+            return JsonResult.failMessage("请登录后再操作");
+        }else{
+            TeacherOpenCourseMergeScheduleSession teacherOpenCourseMergeScheduleSession = teacherOpenCourseMergeScheduleSessionService.getInfo(param);
+            return  JsonResult.success(teacherOpenCourseMergeScheduleSession);
+        }
+    }
+
+
+    @GetMapping(API + "/getList.do")
+    public JsonResult<List<TeacherOpenCourseMergeScheduleSession>>getList(TeacherOpenCourseMergeScheduleSessionQuery param,@SCoreUser CoreUser coreUser) {
+        if(null == coreUser){
+            return JsonResult.failMessage("请登录后再操作");
+        }else{
+            List<TeacherOpenCourseMergeScheduleSession>list = teacherOpenCourseMergeScheduleSessionService.getValuesByQuery(param);
+            return  JsonResult.success(list);
+        }
+    }
+
+    @PostMapping(API + "/add.do")
+    public JsonResult addDo(@Validated(ValidateConfig.ADD.class) TeacherOpenCourseMergeScheduleSessionQuery teacherOpenCourseMergeScheduleSessionQuery, BindingResult result,@SCoreUser CoreUser coreUser){
+        if(result.hasErrors()){
+            return JsonResult.failMessage(result);
+        }else{
+            teacherOpenCourseMergeScheduleSessionQuery.setTeacherOpenCourseMergeScheduleSessionAddTime(new Date());
+            teacherOpenCourseMergeScheduleSessionQuery.setUserId(coreUser.getId());
+            teacherOpenCourseMergeScheduleSessionQuery.setOrgId(coreUser.getOrgId());
+            return teacherOpenCourseMergeScheduleSessionService.add(teacherOpenCourseMergeScheduleSessionQuery);
+        }
+    }
+
+
+    /* 后台页面 */
+
+    @GetMapping(MODEL + "/index.do")
+    @Function("teacherOpenCourseMergeScheduleSession.query")
+    public ModelAndView index() {
+        ModelAndView view = new ModelAndView("/jlw/teacherOpenCourseMergeScheduleSession/index.html") ;
+        view.addObject("search", TeacherOpenCourseMergeScheduleSessionQuery.class.getName());
+        return view;
+    }
+
+    @GetMapping(MODEL + "/edit.do")
+    @Function("teacherOpenCourseMergeScheduleSession.edit")
+    public ModelAndView edit(Long teacherOpenCourseMergeScheduleSessionId) {
+        ModelAndView view = new ModelAndView("/jlw/teacherOpenCourseMergeScheduleSession/edit.html");
+        TeacherOpenCourseMergeScheduleSession teacherOpenCourseMergeScheduleSession = teacherOpenCourseMergeScheduleSessionService.queryById(teacherOpenCourseMergeScheduleSessionId);
+        view.addObject("teacherOpenCourseMergeScheduleSession", teacherOpenCourseMergeScheduleSession);
+        return view;
+    }
+
+    @GetMapping(MODEL + "/add.do")
+    @Function("teacherOpenCourseMergeScheduleSession.add")
+    public ModelAndView add(Long teacherOpenCourseMergeScheduleSessionId) {
+        ModelAndView view = new ModelAndView("/jlw/teacherOpenCourseMergeScheduleSession/add.html");
+        if(null != teacherOpenCourseMergeScheduleSessionId){
+            TeacherOpenCourseMergeScheduleSession teacherOpenCourseMergeScheduleSession = teacherOpenCourseMergeScheduleSessionService.queryById(teacherOpenCourseMergeScheduleSessionId);
+            view.addObject("teacherOpenCourseMergeScheduleSession", teacherOpenCourseMergeScheduleSession);
+        }else {
+            view.addObject("teacherOpenCourseMergeScheduleSession", new TeacherOpenCourseMergeScheduleSession());
+        }
+        return view;
+    }
+
+    /* 后台接口 */
+
+    @PostMapping(MODEL + "/list.json")
+    @Function("teacherOpenCourseMergeScheduleSession.query")
+    public JsonResult<PageQuery> list(TeacherOpenCourseMergeScheduleSessionQuery condition){
+        PageQuery page = condition.getPageQuery();
+        teacherOpenCourseMergeScheduleSessionService.queryByCondition(page);
+        return JsonResult.success(page);
+    }
+
+    @PostMapping(MODEL + "/addAll.json")
+    @Function("teacherOpenCourseMergeScheduleSession.add")
+    public JsonResult addAll(TeacherOpenCourseMergeScheduleSessionQuery teacherOpenCourseMergeScheduleSessionQuery,@SCoreUser CoreUser coreUser){
+        if(null == coreUser){
+            return JsonResult.failMessage("请登录后再操作");
+        }else{
+                teacherOpenCourseMergeScheduleSessionQuery.setTeacherOpenCourseMergeScheduleSessionAddTime(new Date());
+                teacherOpenCourseMergeScheduleSessionQuery.setUserId(coreUser.getId());
+                teacherOpenCourseMergeScheduleSessionQuery.setOrgId(coreUser.getOrgId());
+            String msg = teacherOpenCourseMergeScheduleSessionService.addAll(teacherOpenCourseMergeScheduleSessionQuery);
+            if (StringUtils.isBlank(msg)) {
+                return JsonResult.success();
+            } else {
+                return JsonResult.failMessage("新增失败,"+msg);
+            }
+        }
+    }
+
+    @PostMapping(MODEL + "/add.json")
+    @Function("teacherOpenCourseMergeScheduleSession.add")
+    public JsonResult add(@Validated(ValidateConfig.ADD.class) TeacherOpenCourseMergeScheduleSessionQuery teacherOpenCourseMergeScheduleSessionQuery, BindingResult result,@SCoreUser CoreUser coreUser){
+        if(result.hasErrors()){
+            return JsonResult.failMessage(result);
+        }else{
+                teacherOpenCourseMergeScheduleSessionQuery.setTeacherOpenCourseMergeScheduleSessionAddTime(new Date());
+                teacherOpenCourseMergeScheduleSessionQuery.setUserId(coreUser.getId());
+                teacherOpenCourseMergeScheduleSessionQuery.setOrgId(coreUser.getOrgId());
+            return teacherOpenCourseMergeScheduleSessionService.add(teacherOpenCourseMergeScheduleSessionQuery);
+        }
+    }
+
+    @PostMapping(MODEL + "/edit.json")
+    @Function("teacherOpenCourseMergeScheduleSession.edit")
+    public JsonResult<String> update(@Validated(ValidateConfig.UPDATE.class) TeacherOpenCourseMergeScheduleSessionQuery teacherOpenCourseMergeScheduleSessionQuery, BindingResult result) {
+        if(result.hasErrors()){
+            return JsonResult.failMessage(result);
+        }else {
+                teacherOpenCourseMergeScheduleSessionQuery.setTeacherOpenCourseMergeScheduleSessionAddTime(null);
+                teacherOpenCourseMergeScheduleSessionQuery.setUserId(null);
+                teacherOpenCourseMergeScheduleSessionQuery.setOrgId(null);
+            String msg = teacherOpenCourseMergeScheduleSessionService.edit(teacherOpenCourseMergeScheduleSessionQuery);
+            if (StringUtils.isBlank(msg)) {
+                return JsonResult.success();
+            } else {
+                return JsonResult.failMessage("更新失败,"+msg);
+            }
+        }
+    }
+
+
+    @GetMapping(MODEL + "/view.json")
+    @Function("teacherOpenCourseMergeScheduleSession.query")
+    public JsonResult<TeacherOpenCourseMergeScheduleSession>queryInfo(Long teacherOpenCourseMergeScheduleSessionId) {
+        TeacherOpenCourseMergeScheduleSession teacherOpenCourseMergeScheduleSession = teacherOpenCourseMergeScheduleSessionService.queryById( teacherOpenCourseMergeScheduleSessionId);
+        return  JsonResult.success(teacherOpenCourseMergeScheduleSession);
+    }
+
+    @GetMapping(MODEL + "/getValues.json")
+    @Function("teacherOpenCourseMergeScheduleSession.query")
+    public JsonResult<List<TeacherOpenCourseMergeScheduleSession>>getValues(TeacherOpenCourseMergeScheduleSessionQuery param) {
+        List<TeacherOpenCourseMergeScheduleSession>list = teacherOpenCourseMergeScheduleSessionService.getValuesByQuery(param);
+        return  JsonResult.success(list);
+    }
+
+
+    @PostMapping(MODEL + "/delete.json")
+    @Function("teacherOpenCourseMergeScheduleSession.delete")
+    @ResponseBody
+    public JsonResult delete(String ids) {
+        teacherOpenCourseMergeScheduleSessionService.deleteTeacherOpenCourseMergeScheduleSession(ids);
+        return JsonResult.success();
+    }
+
+
+        //下载模板信息
+    @GetMapping(MODEL + "/downloadTemplate.json")
+        public void download(HttpServletRequest request,HttpServletResponse response,@SCoreUser CoreUser coreUser) {
+            if(null == coreUser){
+                return;
+            }
+            XSSFWorkbook workbook = null;
+            InputStream is = null;
+            try {
+                //TODO 改导入模板名字
+                is = new FileInputStream(GetFile.p + File.separator +"filesystem"+ File.separator +"template"+ File.separator+ "导入模板.xlsx");
+
+                workbook = new XSSFWorkbook(is);
+
+                try {
+                    if(null != is){
+                        is.close();
+                    }
+                }catch (Exception e){
+                    e.printStackTrace();
+                }
+
+                //准备将Excel的输出流通过response输出到页面下载
+                //八进制输出流
+                response.setContentType("application/octet-stream");
+
+                //这后面可以设置导出Excel的名称，此例中名为template.xls
+                String fileName = ToolUtils.web2fileName(request,"teacherOpenCourseMergeScheduleSessionTemplate(" + TimeTool.getNowTime("YMD") + ").xlsx");
+
+                response.setHeader("Content-disposition", "attachment;filename="+fileName);
+
+                //刷新缓冲
+                response.flushBuffer();
+
+                //workbook将Excel写入到response的输出流中，供页面下载
+                workbook.write(response.getOutputStream());
+            }catch (Exception e){
+                e.printStackTrace();
+            } finally {
+                try {
+                    if (null != workbook) {
+                        workbook.close();
+                    }
+                    if (null != response && null != response.getOutputStream()) {
+                        response.getOutputStream().close();
+                    }
+                } catch (Exception e) { }
+            }
+        }
+
+        //导入模板信息
+    @PostMapping(MODEL + "/importTemplate.json")
+    @Function("teacherOpenCourseMergeScheduleSession.importTemplate")
+        public JsonResult importTemplate(@RFile List<FileEntity> fileEntityList,@SCoreUser CoreUser coreUser) {
+            if(null == coreUser){
+                return JsonResult.failMessage("请登录后再操作");
+            }
+            List<Long>list=new ArrayList<>();
+            JsonResult jsonResult = teacherOpenCourseMergeScheduleSessionService.importTemplate(fileEntityList,list,coreUser);
+            if(list.size()>0){
+                teacherOpenCourseMergeScheduleSessionService.deleteByList(list);
+            }
+            return jsonResult;
+        }
+
+        //导出信息
+    @GetMapping(MODEL + "/excel/export.json")
+    @Function("teacherOpenCourseMergeScheduleSession.exportDocument")
+        public void export(HttpServletRequest request,HttpServletResponse response,TeacherOpenCourseMergeScheduleSessionQuery teacherOpenCourseMergeScheduleSessionQuery,@SCoreUser CoreUser coreUser) {
+            if(null == coreUser){
+                return;
+            }
+            HSSFWorkbook workbook = null;
+            try {
+                //表头数据
+                String[] header = {
+                            "开课",
+                            "课程排课配置",
+                            "添加时间",
+                            "状态",
+            };
+                String[] headerCode = {
+                            "teacherOpenCourseId",
+                            "teacherOpenCourseScheduleSessionId",
+                            "teacherOpenCourseMergeScheduleSessionAddTime",
+                            "teacherOpenCourseMergeScheduleSessionStatus",
+            };
+
+                //数据内容
+                List<Map<String, Object>> mapList = teacherOpenCourseMergeScheduleSessionService.getExcelValues(teacherOpenCourseMergeScheduleSessionQuery);
+
+                //内容宽度
+                Map<String, Object> widthMap = mapList.get(0);
+                mapList.remove(0);
+
+                //声明一个工作簿
+                workbook = new HSSFWorkbook();
+
+                //生成一个表格，设置表格名称为"Sheet1"
+                HSSFSheet sheet = workbook.createSheet("Sheet1");
+
+                //冻结表头
+                sheet.createFreezePane(0, 1, 0, 1);
+
+                //设置默认列宽度为5个字节
+                sheet.setDefaultColumnWidth(5);
+
+                //创建第一行表头
+                HSSFRow headRow = sheet.createRow(0);
+
+                //头部样式
+                HSSFCellStyle headerStyle = workbook.createCellStyle();
+                //垂直居中
+                headerStyle.setVerticalAlignment(VerticalAlignment.CENTER);
+                //水平居中
+                headerStyle.setAlignment(HorizontalAlignment.CENTER);
+
+                //单元格样式
+                HSSFCellStyle cellStyle = workbook.createCellStyle();
+                //垂直居中
+                cellStyle.setVerticalAlignment(VerticalAlignment.CENTER);
+                //水平居左
+                cellStyle.setAlignment(HorizontalAlignment.CENTER);
+                //自动换行
+                cellStyle.setWrapText(true);
+
+                //遍历添加表头
+                for (int i = 0; i < header.length; i++) {
+
+                    //设置表格特定的列宽度
+                    if (null != widthMap.get(headerCode[i])) {
+                        String width = widthMap.get(headerCode[i]).toString().split("\\.")[0];
+                        Integer w = Integer.parseInt(width) > header[i].length()*3?Integer.parseInt(width):header[i].length()*3;
+                        sheet.setColumnWidth(i, w * 190);
+                    }
+
+                    //创建一个单元格
+                    HSSFCell cell = headRow.createCell(i);
+
+                    //创建一个内容对象
+                    HSSFRichTextString text = new HSSFRichTextString(header[i]);
+
+                    //将内容对象的文字内容写入到单元格中
+                    cell.setCellValue(text);
+
+                    //设置样式
+                    cell.setCellStyle(headerStyle);
+                }
+
+                //遍历结果集，把内容加入表格
+                for (int i = 0; i < mapList.size(); i++) {
+                    HSSFRow row = sheet.createRow(i + 1);
+
+                    row.setHeight((short) (50*10));
+
+                    Map<String, Object> map = mapList.get(i);
+                    for (int j = 0; j < headerCode.length; j++) {
+                        HSSFCell cell = row.createCell(j);
+                        cell.setCellStyle(cellStyle);
+                        HSSFRichTextString text = new HSSFRichTextString(null != map.get(headerCode[j]) ? map.get(headerCode[j]).toString() : " ");
+                        cell.setCellValue(text);
+                    }
+                }
+
+
+                //准备将Excel的输出流通过response输出到页面下载
+                //八进制输出流
+                response.setContentType("application/octet-stream");
+
+                //这后面可以设置导出Excel的名称，此例中名为student.xls
+                String fileName = ToolUtils.web2fileName(request,"teacherOpenCourseMergeScheduleSession(" + TimeTool.getNowTime("YMD") + ").xls");
+
+                response.setHeader("Content-disposition", "attachment;filename="+fileName);
+
+                //刷新缓冲
+                response.flushBuffer();
+
+                //workbook将Excel写入到response的输出流中，供页面下载
+                workbook.write(response.getOutputStream());
+            }catch (Exception e){
+                e.printStackTrace();
+            } finally {
+                try {
+                    if (null != workbook) {
+                        workbook.close();
+                    }
+                    if (null != response && null != response.getOutputStream()) {
+                        response.getOutputStream().close();
+                    }
+                } catch (Exception e) { }
+            }
+        }
+
+}

web/src/main/java/com/ibeetl/jlw/web/query/TeacherOpenCourseMergeScheduleSessionQuery.java

@@ -0,0 +1,131 @@
+package com.ibeetl.jlw.web.query;
+
+import cn.jlw.validate.ValidateConfig;
+import com.ibeetl.admin.core.annotation.Query;
+import com.ibeetl.admin.core.web.query.PageParam;
+import com.ibeetl.jlw.entity.TeacherOpenCourseMergeScheduleSession;
+
+import javax.validation.constraints.NotNull;
+import java.util.Date;
+
+/**
+ *开课关联排课配置查询
+ */
+public class TeacherOpenCourseMergeScheduleSessionQuery extends PageParam {
+    @NotNull(message = "ID不能为空", groups =ValidateConfig.UPDATE.class)
+    @Query(name = "课程开课-班级-排课配置-关联ID", display = false)
+    private Long teacherOpenCourseMergeScheduleSessionId;
+    @Query(name = "开课ID", display = true,type=Query.TYPE_DICT,dict="teacher_open_course.teacher_open_course_title.teacher_open_course_status=1")
+    private Long teacherOpenCourseId;
+    @Query(name = "课程排课配置ID", display = false)
+    private Long teacherOpenCourseScheduleSessionId;
+    @Query(name = "添加时间", display = false)
+    private Date teacherOpenCourseMergeScheduleSessionAddTime;
+    @Query(name = "状态", display = true,type=Query.TYPE_DICT,dict="global_status")
+    private Integer teacherOpenCourseMergeScheduleSessionStatus;
+    @Query(name = "组织ID", display = false)
+    private Long orgId;
+    @Query(name = "用户ID", display = false)
+    private Long userId;
+
+    private String teacherOpenCourseMergeScheduleSessionIdPlural;
+    private String teacherOpenCourseIdPlural;
+    private String orgIdPlural;
+    private String userIdPlural;
+
+    private String teacherOpenCourseMergeScheduleSessionJsonStr;//json格式
+
+    private String _given;//指定更新的特定字段，多个逗号隔开
+
+    public Long getTeacherOpenCourseMergeScheduleSessionId(){
+        return  teacherOpenCourseMergeScheduleSessionId;
+    }
+    public void setTeacherOpenCourseMergeScheduleSessionId(Long teacherOpenCourseMergeScheduleSessionId ){
+        this.teacherOpenCourseMergeScheduleSessionId = teacherOpenCourseMergeScheduleSessionId;
+    }
+    public Long getTeacherOpenCourseId(){
+        return  teacherOpenCourseId;
+    }
+    public void setTeacherOpenCourseId(Long teacherOpenCourseId ){
+        this.teacherOpenCourseId = teacherOpenCourseId;
+    }
+    public Long getTeacherOpenCourseScheduleSessionId(){
+        return  teacherOpenCourseScheduleSessionId;
+    }
+    public void setTeacherOpenCourseScheduleSessionId(Long teacherOpenCourseScheduleSessionId ){
+        this.teacherOpenCourseScheduleSessionId = teacherOpenCourseScheduleSessionId;
+    }
+    public Date getTeacherOpenCourseMergeScheduleSessionAddTime(){
+        return  teacherOpenCourseMergeScheduleSessionAddTime;
+    }
+    public void setTeacherOpenCourseMergeScheduleSessionAddTime(Date teacherOpenCourseMergeScheduleSessionAddTime ){
+        this.teacherOpenCourseMergeScheduleSessionAddTime = teacherOpenCourseMergeScheduleSessionAddTime;
+    }
+    public Integer getTeacherOpenCourseMergeScheduleSessionStatus(){
+        return  teacherOpenCourseMergeScheduleSessionStatus;
+    }
+    public void setTeacherOpenCourseMergeScheduleSessionStatus(Integer teacherOpenCourseMergeScheduleSessionStatus ){
+        this.teacherOpenCourseMergeScheduleSessionStatus = teacherOpenCourseMergeScheduleSessionStatus;
+    }
+    public Long getOrgId(){
+        return  orgId;
+    }
+    public void setOrgId(Long orgId ){
+        this.orgId = orgId;
+    }
+    public Long getUserId(){
+        return  userId;
+    }
+    public void setUserId(Long userId ){
+        this.userId = userId;
+    }
+
+    public TeacherOpenCourseMergeScheduleSession pojo(){
+        TeacherOpenCourseMergeScheduleSession pojo = new TeacherOpenCourseMergeScheduleSession();
+        pojo.setTeacherOpenCourseMergeScheduleSessionId(this.getTeacherOpenCourseMergeScheduleSessionId());
+        pojo.setTeacherOpenCourseId(this.getTeacherOpenCourseId());
+        pojo.setTeacherOpenCourseScheduleSessionId(this.getTeacherOpenCourseScheduleSessionId());
+        pojo.setTeacherOpenCourseMergeScheduleSessionAddTime(this.getTeacherOpenCourseMergeScheduleSessionAddTime());
+        pojo.setTeacherOpenCourseMergeScheduleSessionStatus(this.getTeacherOpenCourseMergeScheduleSessionStatus());
+        pojo.setOrgId(this.getOrgId());
+        pojo.setUserId(this.getUserId());
+        return pojo;
+    }
+
+    public String getTeacherOpenCourseMergeScheduleSessionIdPlural(){
+        return  teacherOpenCourseMergeScheduleSessionIdPlural;
+    }
+    public void setTeacherOpenCourseMergeScheduleSessionIdPlural(String teacherOpenCourseMergeScheduleSessionIdPlural){
+        this.teacherOpenCourseMergeScheduleSessionIdPlural = teacherOpenCourseMergeScheduleSessionIdPlural;
+    }
+    public String getTeacherOpenCourseIdPlural(){
+        return  teacherOpenCourseIdPlural;
+    }
+    public void setTeacherOpenCourseIdPlural(String teacherOpenCourseIdPlural){
+        this.teacherOpenCourseIdPlural = teacherOpenCourseIdPlural;
+    }
+    public String getOrgIdPlural(){
+        return  orgIdPlural;
+    }
+    public void setOrgIdPlural(String orgIdPlural){
+        this.orgIdPlural = orgIdPlural;
+    }
+    public String getUserIdPlural(){
+        return  userIdPlural;
+    }
+    public void setUserIdPlural(String userIdPlural){
+        this.userIdPlural = userIdPlural;
+    }
+    public String getTeacherOpenCourseMergeScheduleSessionJsonStr(){
+        return  teacherOpenCourseMergeScheduleSessionJsonStr;
+    }
+    public void setTeacherOpenCourseMergeScheduleSessionJsonStr(String teacherOpenCourseMergeScheduleSessionJsonStr ){
+        this.teacherOpenCourseMergeScheduleSessionJsonStr = teacherOpenCourseMergeScheduleSessionJsonStr;
+    }
+    public String get_given() {
+        return _given;
+    }
+    public void set_given(String _given) {
+        this._given = _given;
+    }
+}

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

@@ -0,0 +1,373 @@
+queryByCondition
+===
+* 根据不为空的参数进行分页查询
+
+  select
+  @pageTag(){
+  t.*
+  @}
+  from teacher_open_course_merge_schedule_session t
+  where 1=1  
+  @//数据权限，该sql语句功能点,如果不考虑数据权限，可以删除此行  
+  and #function("teacherOpenCourseMergeScheduleSession.query")#
+  @if(!isEmpty(teacherOpenCourseMergeScheduleSessionId)){
+  and t.teacher_open_course_merge_schedule_session_id =#teacherOpenCourseMergeScheduleSessionId#
+  @}
+  @if(!isEmpty(teacherOpenCourseMergeScheduleSessionIdPlural)){
+  and find_in_set(t.teacher_open_course_merge_schedule_session_id,#teacherOpenCourseMergeScheduleSessionIdPlural#)
+  @}
+  @if(!isEmpty(teacherOpenCourseId)){
+  and t.teacher_open_course_id =#teacherOpenCourseId#
+  @}
+  @if(!isEmpty(teacherOpenCourseIdPlural)){
+  and find_in_set(t.teacher_open_course_id,#teacherOpenCourseIdPlural#)
+  @}
+  @if(!isEmpty(teacherOpenCourseScheduleSessionId)){
+  and t.teacher_open_course_schedule_session_id =#teacherOpenCourseScheduleSessionId#
+  @}
+  @if(!isEmpty(teacherOpenCourseMergeScheduleSessionAddTime)){
+  and t.teacher_open_course_merge_schedule_session_add_time =#teacherOpenCourseMergeScheduleSessionAddTime#
+  @}
+  @if(!isEmpty(teacherOpenCourseMergeScheduleSessionStatus)){
+  and t.teacher_open_course_merge_schedule_session_status =#teacherOpenCourseMergeScheduleSessionStatus#
+  @}
+  @if(!isEmpty(orgId)){
+  and t.org_id =#orgId#
+  @}
+  @if(!isEmpty(orgIdPlural)){
+  and find_in_set(t.org_id,#orgIdPlural#)
+  @}
+  @if(!isEmpty(userId)){
+  and t.user_id =#userId#
+  @}
+  @if(!isEmpty(userIdPlural)){
+  and find_in_set(t.user_id,#userIdPlural#)
+  @}
+
+
+queryByConditionQuery
+===
+* 根据不为空的参数进行分页查询(无权限)
+
+  select
+  @pageTag(){
+  t.*
+  @}
+  from teacher_open_course_merge_schedule_session t
+  where 1=1  
+  @if(!isEmpty(teacherOpenCourseMergeScheduleSessionId)){
+  and t.teacher_open_course_merge_schedule_session_id =#teacherOpenCourseMergeScheduleSessionId#
+  @}
+  @if(!isEmpty(teacherOpenCourseMergeScheduleSessionIdPlural)){
+  and find_in_set(t.teacher_open_course_merge_schedule_session_id,#teacherOpenCourseMergeScheduleSessionIdPlural#)
+  @}
+  @if(!isEmpty(teacherOpenCourseId)){
+  and t.teacher_open_course_id =#teacherOpenCourseId#
+  @}
+  @if(!isEmpty(teacherOpenCourseIdPlural)){
+  and find_in_set(t.teacher_open_course_id,#teacherOpenCourseIdPlural#)
+  @}
+  @if(!isEmpty(teacherOpenCourseScheduleSessionId)){
+  and t.teacher_open_course_schedule_session_id =#teacherOpenCourseScheduleSessionId#
+  @}
+  @if(!isEmpty(teacherOpenCourseMergeScheduleSessionAddTime)){
+  and t.teacher_open_course_merge_schedule_session_add_time =#teacherOpenCourseMergeScheduleSessionAddTime#
+  @}
+  @if(!isEmpty(teacherOpenCourseMergeScheduleSessionStatus)){
+  and t.teacher_open_course_merge_schedule_session_status =#teacherOpenCourseMergeScheduleSessionStatus#
+  @}
+  @if(!isEmpty(orgId)){
+  and t.org_id =#orgId#
+  @}
+  @if(!isEmpty(orgIdPlural)){
+  and find_in_set(t.org_id,#orgIdPlural#)
+  @}
+  @if(!isEmpty(userId)){
+  and t.user_id =#userId#
+  @}
+  @if(!isEmpty(userIdPlural)){
+  and find_in_set(t.user_id,#userIdPlural#)
+  @}
+
+
+
+
+deleteTeacherOpenCourseMergeScheduleSessionByIds
+===
+
+* 批量删除
+
+  delete from teacher_open_course_merge_schedule_session where find_in_set(teacher_open_course_merge_schedule_session_id,#ids#)
+
+
+
+getByIds
+===
+
+select * from teacher_open_course_merge_schedule_session where find_in_set(teacher_open_course_merge_schedule_session_id,#ids#)
+
+
+updateGivenByIds
+===
+
+* 批量更新指定字段，无论此字段是否有值
+
+  update teacher_open_course_merge_schedule_session
+  set
+  @if(contain("teacherOpenCourseId",_given)){
+  @if(isEmpty(teacherOpenCourseId)){
+  teacher_open_course_id = null ,
+  @}else{
+  teacher_open_course_id = #teacherOpenCourseId# ,
+  @}
+  @}
+  @if(contain("teacherOpenCourseScheduleSessionId",_given)){
+  @if(isEmpty(teacherOpenCourseScheduleSessionId)){
+  teacher_open_course_schedule_session_id = null ,
+  @}else{
+  teacher_open_course_schedule_session_id = #teacherOpenCourseScheduleSessionId# ,
+  @}
+  @}
+  @if(contain("teacherOpenCourseMergeScheduleSessionAddTime",_given)){
+  @if(isEmpty(teacherOpenCourseMergeScheduleSessionAddTime)){
+  teacher_open_course_merge_schedule_session_add_time = null ,
+  @}else{
+  teacher_open_course_merge_schedule_session_add_time = #teacherOpenCourseMergeScheduleSessionAddTime# ,
+  @}
+  @}
+  @if(contain("teacherOpenCourseMergeScheduleSessionStatus",_given)){
+  @if(isEmpty(teacherOpenCourseMergeScheduleSessionStatus)){
+  teacher_open_course_merge_schedule_session_status = null ,
+  @}else{
+  teacher_open_course_merge_schedule_session_status = #teacherOpenCourseMergeScheduleSessionStatus# ,
+  @}
+  @}
+  @if(contain("orgId",_given)){
+  @if(isEmpty(orgId)){
+  org_id = null ,
+  @}else{
+  org_id = #orgId# ,
+  @}
+  @}
+  @if(contain("userId",_given)){
+  @if(isEmpty(userId)){
+  user_id = null ,
+  @}else{
+  user_id = #userId# ,
+  @}
+  @}
+  teacher_open_course_merge_schedule_session_id = teacher_open_course_merge_schedule_session_id
+  where find_in_set(teacher_open_course_merge_schedule_session_id,#teacherOpenCourseMergeScheduleSessionIdPlural#)
+
+
+
+getTeacherOpenCourseMergeScheduleSessionValues
+===
+
+* 根据不为空的参数进行查询
+
+  select t.*
+  from teacher_open_course_merge_schedule_session t
+  where 1=1  
+  @if(!isEmpty(teacherOpenCourseMergeScheduleSessionId)){
+  and t.teacher_open_course_merge_schedule_session_id =#teacherOpenCourseMergeScheduleSessionId#
+  @}
+  @if(!isEmpty(teacherOpenCourseId)){
+  and t.teacher_open_course_id =#teacherOpenCourseId#
+  @}
+  @if(!isEmpty(teacherOpenCourseScheduleSessionId)){
+  and t.teacher_open_course_schedule_session_id =#teacherOpenCourseScheduleSessionId#
+  @}
+  @if(!isEmpty(teacherOpenCourseMergeScheduleSessionAddTime)){
+  and t.teacher_open_course_merge_schedule_session_add_time =#teacherOpenCourseMergeScheduleSessionAddTime#
+  @}
+  @if(!isEmpty(teacherOpenCourseMergeScheduleSessionStatus)){
+  and t.teacher_open_course_merge_schedule_session_status =#teacherOpenCourseMergeScheduleSessionStatus#
+  @}
+  @if(!isEmpty(orgId)){
+  and t.org_id =#orgId#
+  @}
+  @if(!isEmpty(userId)){
+  and t.user_id =#userId#
+  @}
+
+
+getValuesByQuery
+===
+
+* 根据不为空的参数进行查询
+
+  select t.*
+  from teacher_open_course_merge_schedule_session t
+  where 1=1 and #function("teacherOpenCourseMergeScheduleSession.query")#
+  @if(!isEmpty(teacherOpenCourseMergeScheduleSessionId)){
+  and t.teacher_open_course_merge_schedule_session_id =#teacherOpenCourseMergeScheduleSessionId#
+  @}
+  @if(!isEmpty(teacherOpenCourseMergeScheduleSessionIdPlural)){
+  and find_in_set(t.teacher_open_course_merge_schedule_session_id,#teacherOpenCourseMergeScheduleSessionIdPlural#)
+  @}
+  @if(!isEmpty(teacherOpenCourseId)){
+  and t.teacher_open_course_id =#teacherOpenCourseId#
+  @}
+  @if(!isEmpty(teacherOpenCourseIdPlural)){
+  and find_in_set(t.teacher_open_course_id,#teacherOpenCourseIdPlural#)
+  @}
+  @if(!isEmpty(teacherOpenCourseScheduleSessionId)){
+  and t.teacher_open_course_schedule_session_id =#teacherOpenCourseScheduleSessionId#
+  @}
+  @if(!isEmpty(teacherOpenCourseMergeScheduleSessionAddTime)){
+  and t.teacher_open_course_merge_schedule_session_add_time =#teacherOpenCourseMergeScheduleSessionAddTime#
+  @}
+  @if(!isEmpty(teacherOpenCourseMergeScheduleSessionStatus)){
+  and t.teacher_open_course_merge_schedule_session_status =#teacherOpenCourseMergeScheduleSessionStatus#
+  @}
+  @if(!isEmpty(orgId)){
+  and t.org_id =#orgId#
+  @}
+  @if(!isEmpty(orgIdPlural)){
+  and find_in_set(t.org_id,#orgIdPlural#)
+  @}
+  @if(!isEmpty(userId)){
+  and t.user_id =#userId#
+  @}
+  @if(!isEmpty(userIdPlural)){
+  and find_in_set(t.user_id,#userIdPlural#)
+  @}
+
+
+getValuesByQueryNotWithPermission
+===
+
+* 根据不为空的参数进行查询（不包含权限）
+
+  select t.*
+  from teacher_open_course_merge_schedule_session t
+  where 1=1
+  @if(!isEmpty(teacherOpenCourseMergeScheduleSessionId)){
+  and t.teacher_open_course_merge_schedule_session_id =#teacherOpenCourseMergeScheduleSessionId#
+  @}
+  @if(!isEmpty(teacherOpenCourseMergeScheduleSessionIdPlural)){
+  and find_in_set(t.teacher_open_course_merge_schedule_session_id,#teacherOpenCourseMergeScheduleSessionIdPlural#)
+  @}
+  @if(!isEmpty(teacherOpenCourseId)){
+  and t.teacher_open_course_id =#teacherOpenCourseId#
+  @}
+  @if(!isEmpty(teacherOpenCourseIdPlural)){
+  and find_in_set(t.teacher_open_course_id,#teacherOpenCourseIdPlural#)
+  @}
+  @if(!isEmpty(teacherOpenCourseScheduleSessionId)){
+  and t.teacher_open_course_schedule_session_id =#teacherOpenCourseScheduleSessionId#
+  @}
+  @if(!isEmpty(teacherOpenCourseMergeScheduleSessionAddTime)){
+  and t.teacher_open_course_merge_schedule_session_add_time =#teacherOpenCourseMergeScheduleSessionAddTime#
+  @}
+  @if(!isEmpty(teacherOpenCourseMergeScheduleSessionStatus)){
+  and t.teacher_open_course_merge_schedule_session_status =#teacherOpenCourseMergeScheduleSessionStatus#
+  @}
+  @if(!isEmpty(orgId)){
+  and t.org_id =#orgId#
+  @}
+  @if(!isEmpty(orgIdPlural)){
+  and find_in_set(t.org_id,#orgIdPlural#)
+  @}
+  @if(!isEmpty(userId)){
+  and t.user_id =#userId#
+  @}
+  @if(!isEmpty(userIdPlural)){
+  and find_in_set(t.user_id,#userIdPlural#)
+  @}
+
+
+
+
+getExcelValues
+===
+
+* 根据不为空的参数进行查询导入需要的参数
+
+  SELECT * FROM (
+  (
+  select
+  MAX(LENGTH(t.teacher_open_course_id)) teacher_open_course_id,
+  MAX(LENGTH(t.teacher_open_course_schedule_session_id)) teacher_open_course_schedule_session_id,
+  MAX(LENGTH(t.teacher_open_course_merge_schedule_session_status)) teacher_open_course_merge_schedule_session_status,
+  from teacher_open_course_merge_schedule_session t
+  where 1=1 and #function("teacherOpenCourseMergeScheduleSession.query")#
+  @if(!isEmpty(teacherOpenCourseMergeScheduleSessionId)){
+  and t.teacher_open_course_merge_schedule_session_id =#teacherOpenCourseMergeScheduleSessionId#
+  @}
+  @if(!isEmpty(teacherOpenCourseMergeScheduleSessionIdPlural)){
+  and find_in_set(t.teacher_open_course_merge_schedule_session_id,#teacherOpenCourseMergeScheduleSessionIdPlural#)
+  @}
+  @if(!isEmpty(teacherOpenCourseId)){
+  and t.teacher_open_course_id =#teacherOpenCourseId#
+  @}
+  @if(!isEmpty(teacherOpenCourseIdPlural)){
+  and find_in_set(t.teacher_open_course_id,#teacherOpenCourseIdPlural#)
+  @}
+  @if(!isEmpty(teacherOpenCourseScheduleSessionId)){
+  and t.teacher_open_course_schedule_session_id =#teacherOpenCourseScheduleSessionId#
+  @}
+  @if(!isEmpty(teacherOpenCourseMergeScheduleSessionAddTime)){
+  and t.teacher_open_course_merge_schedule_session_add_time =#teacherOpenCourseMergeScheduleSessionAddTime#
+  @}
+  @if(!isEmpty(teacherOpenCourseMergeScheduleSessionStatus)){
+  and t.teacher_open_course_merge_schedule_session_status =#teacherOpenCourseMergeScheduleSessionStatus#
+  @}
+  @if(!isEmpty(orgId)){
+  and t.org_id =#orgId#
+  @}
+  @if(!isEmpty(orgIdPlural)){
+  and find_in_set(t.org_id,#orgIdPlural#)
+  @}
+  @if(!isEmpty(userId)){
+  and t.user_id =#userId#
+  @}
+  @if(!isEmpty(userIdPlural)){
+  and find_in_set(t.user_id,#userIdPlural#)
+  @}
+  )
+  UNION ALL
+  (
+  select
+  t.teacher_open_course_id ,
+  t.teacher_open_course_schedule_session_id ,
+  t.teacher_open_course_merge_schedule_session_status ,
+  from teacher_open_course_merge_schedule_session t
+  where 1=1 and #function("teacherOpenCourseMergeScheduleSession.query")#  
+  @if(!isEmpty(teacherOpenCourseMergeScheduleSessionId)){
+  and t.teacher_open_course_merge_schedule_session_id =#teacherOpenCourseMergeScheduleSessionId#
+  @}
+  @if(!isEmpty(teacherOpenCourseMergeScheduleSessionIdPlural)){
+  and find_in_set(t.teacher_open_course_merge_schedule_session_id,#teacherOpenCourseMergeScheduleSessionIdPlural#)
+  @}
+  @if(!isEmpty(teacherOpenCourseId)){
+  and t.teacher_open_course_id =#teacherOpenCourseId#
+  @}
+  @if(!isEmpty(teacherOpenCourseIdPlural)){
+  and find_in_set(t.teacher_open_course_id,#teacherOpenCourseIdPlural#)
+  @}
+  @if(!isEmpty(teacherOpenCourseScheduleSessionId)){
+  and t.teacher_open_course_schedule_session_id =#teacherOpenCourseScheduleSessionId#
+  @}
+  @if(!isEmpty(teacherOpenCourseMergeScheduleSessionAddTime)){
+  and t.teacher_open_course_merge_schedule_session_add_time =#teacherOpenCourseMergeScheduleSessionAddTime#
+  @}
+  @if(!isEmpty(teacherOpenCourseMergeScheduleSessionStatus)){
+  and t.teacher_open_course_merge_schedule_session_status =#teacherOpenCourseMergeScheduleSessionStatus#
+  @}
+  @if(!isEmpty(orgId)){
+  and t.org_id =#orgId#
+  @}
+  @if(!isEmpty(orgIdPlural)){
+  and find_in_set(t.org_id,#orgIdPlural#)
+  @}
+  @if(!isEmpty(userId)){
+  and t.user_id =#userId#
+  @}
+  @if(!isEmpty(userIdPlural)){
+  and find_in_set(t.user_id,#userIdPlural#)
+  @}
+  )
+  )t
+

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

@@ -0,0 +1,38 @@
+layui.define([ 'form', 'laydate', 'table','teacherOpenCourseMergeScheduleSessionApi'], function(exports) {
+    var form = layui.form;
+    var teacherOpenCourseMergeScheduleSessionApi = layui.teacherOpenCourseMergeScheduleSessionApi;
+    var index = layui.index;
+    var view = {
+        init:function(){
+            Lib.initGenrealForm($("#addForm"),form);
+            this.initSubmit();
+        },
+        initSubmit:function(){
+            $("#addButton").click(function(){
+                 form.on('submit(form)', function(){
+                     var teacherOpenCourseMergeScheduleSessionId = $("#addForm input[name='teacherOpenCourseMergeScheduleSessionId']").val();
+                     if(!$.isEmpty(teacherOpenCourseMergeScheduleSessionId)){
+                         teacherOpenCourseMergeScheduleSessionApi.updateTeacherOpenCourseMergeScheduleSession($('#addForm'),function(){
+                             parent.window.dataReload();
+                             Common.info("更新成功");
+                             Lib.closeFrame();
+                         });
+                     }else{
+                         teacherOpenCourseMergeScheduleSessionApi.addTeacherOpenCourseMergeScheduleSession($('#addForm'),function(){
+                             parent.window.dataReload();
+                             Common.info("添加成功");
+                             Lib.closeFrame();
+                         });
+                     }
+
+                });
+            });
+        
+            $("#addButton-cancel").click(function(){
+                Lib.closeFrame();
+            });
+        }
+    			
+    }
+    exports('add',view);
+});

web/src/main/resources/static/js/jlw/teacherOpenCourseMergeScheduleSession/del.js

@@ -0,0 +1,23 @@
+layui.define(['table', 'teacherOpenCourseMergeScheduleSessionApi'], function(exports) {
+    var teacherOpenCourseMergeScheduleSessionApi = layui.teacherOpenCourseMergeScheduleSessionApi;
+    var table=layui.table;
+    var view = {
+        init:function(){
+        },
+        delBatch:function(){
+            var data = Common.getMoreDataFromTable(table,"teacherOpenCourseMergeScheduleSessionTable");
+            if(data==null){
+                return ;
+            }
+            Common.openConfirm("确认要删除这些开课关联排课配置?",function(){
+            var ids =Common.concatBatchId(data,"teacherOpenCourseMergeScheduleSessionId");
+            teacherOpenCourseMergeScheduleSessionApi.del(ids,function(){
+                Common.info("删除成功");
+                    dataReload();
+                })
+            })
+        }
+    }
+    exports('del',view);
+	
+});

web/src/main/resources/static/js/jlw/teacherOpenCourseMergeScheduleSession/edit.js

@@ -0,0 +1,28 @@
+layui.define([ 'form', 'laydate', 'table','teacherOpenCourseMergeScheduleSessionApi'], function(exports) {
+    var form = layui.form;
+    var teacherOpenCourseMergeScheduleSessionApi = layui.teacherOpenCourseMergeScheduleSessionApi;
+    var index = layui.index;
+    var view = {
+        init:function(){
+	        Lib.initGenrealForm($("#updateForm"),form);
+	        this.initSubmit();
+        },
+        initSubmit:function(){
+            $("#updateButton").click(function(){
+                form.on('submit(form)', function(){
+                    teacherOpenCourseMergeScheduleSessionApi.updateTeacherOpenCourseMergeScheduleSession($('#updateForm'),function(){
+                       parent.window.dataReload();
+                       Common.info("更新成功");
+                       Lib.closeFrame();
+                    });
+                });
+            });
+            $("#updateButton-cancel").click(function(){
+                Lib.closeFrame();
+            });
+        }
+            
+    }
+    exports('edit',view);
+	
+});

web/src/main/resources/static/js/jlw/teacherOpenCourseMergeScheduleSession/index.js

@@ -0,0 +1,189 @@
+layui.define([ 'form', 'laydate', 'table' ], function(exports) {
+    var form = layui.form;
+    var laydate = layui.laydate;
+    var table = layui.table;
+    var teacherOpenCourseMergeScheduleSessionTable = null;
+    var view ={
+        init:function(){
+            var that = this
+            this.initTable();
+            this.initSearchForm();
+            this.initToolBar();
+            window.dataReload = function(){
+                Lib.doSearchForm($("#searchForm"),teacherOpenCourseMergeScheduleSessionTable)
+                that.initToolBar();
+            }
+        },
+        initTable:function(){
+            var sx_ = localStorage.getItem("teacherOpenCourseMergeScheduleSessionTable_field_"+Common.userInfoId); //筛选值显示、隐藏缓存
+            if($.isEmpty(sx_)){sx_ = {};}else {sx_ = JSON.parse(sx_);}
+            teacherOpenCourseMergeScheduleSessionTable = table.render({
+                elem : '#teacherOpenCourseMergeScheduleSessionTable',
+                height : Lib.getTableHeight(1),
+                cellMinWidth: 100,
+                method : 'post',
+                url : Common.ctxPath + '/jlw/teacherOpenCourseMergeScheduleSession/list.json' // 数据接口
+                ,page : Lib.tablePage // 开启分页
+                ,toolbar: '#toolbar_teacherOpenCourseMergeScheduleSession' //自定义头部左侧工具栏
+                ,defaultToolbar: ['filter', 'print', 'exports'] //头部右侧工具栏
+                ,limit : 10,
+                cols : [ [ // 表头
+                    {
+                        type : 'checkbox',
+
+                    },
+                {
+                    field : 'teacherOpenCourseMergeScheduleSessionId', 
+                    title : '课程开课-班级-排课配置-关联ID',
+                    align:"center",
+                    hideField :false,
+                    hide:$.isEmpty(sx_['teacherOpenCourseMergeScheduleSessionId'])?false:sx_['teacherOpenCourseMergeScheduleSessionId'],
+
+                        width : 60,
+                },
+                {
+                    field : 'teacherOpenCourseIdText', //数据字典类型为 teacher_open_course.teacher_open_course_title.teacher_open_course_status=1
+                    title : '开课ID',
+                    align:"center",
+                    hideField :false,
+                    hide:$.isEmpty(sx_['teacherOpenCourseIdText'])?false:sx_['teacherOpenCourseIdText'],
+                },
+                {
+                    field : 'teacherOpenCourseScheduleSessionId', 
+                    title : '课程排课配置ID',
+                    align:"center",
+                    hideField :false,
+                    hide:$.isEmpty(sx_['teacherOpenCourseScheduleSessionId'])?false:sx_['teacherOpenCourseScheduleSessionId'],
+                },
+                {
+                    field : 'teacherOpenCourseMergeScheduleSessionAddTime', 
+                    title : '添加时间',
+                    align:"center",
+                    hideField :false,
+                    hide:$.isEmpty(sx_['teacherOpenCourseMergeScheduleSessionAddTime'])?false:sx_['teacherOpenCourseMergeScheduleSessionAddTime'],
+                },
+                {
+                    field : 'teacherOpenCourseMergeScheduleSessionStatusText', //数据字典类型为 global_status
+                    title : '状态',
+                    align:"center",
+                    hideField :false,
+                    hide:$.isEmpty(sx_['teacherOpenCourseMergeScheduleSessionStatusText'])?false:sx_['teacherOpenCourseMergeScheduleSessionStatusText'],
+                },
+                {
+                    field : 'orgId', 
+                    title : '组织ID',
+                    align:"center",
+                    hideField :false,
+                    hide:$.isEmpty(sx_['orgId'])?false:sx_['orgId'],
+                },
+                {
+                    field : 'userId', 
+                    title : '用户ID',
+                    align:"center",
+                    hideField :false,
+                    hide:$.isEmpty(sx_['userId'])?false:sx_['userId'],
+                }
+                ,{
+                    field : 'operation_',title : '操作',align:"center", templet: function (d) {
+                        var htm = '<button type="button" class="layui-btn layui-btn-normal layui-btn-xs" lay-event="edit">编辑</button>';
+                        htm += '<button type="button" class="layui-btn layui-btn-danger layui-btn-xs" lay-event="del">删除</button>';
+                        return htm;
+                    }
+                }
+
+        ] ]
+
+        });
+
+            table.on('checkbox(teacherOpenCourseMergeScheduleSessionTable)', function(obj){
+                var teacherOpenCourseMergeScheduleSession = obj.data;
+                if(obj.checked){
+                    //按钮逻辑Lib.buttonEnable()
+                }else{
+
+                }
+            })
+        },
+
+        initSearchForm:function(){
+            Lib.initSearchForm( $("#searchForm"),teacherOpenCourseMergeScheduleSessionTable,form);
+        },
+
+        initToolBar:function(){
+            toolbar = {
+                add: function () {
+                    var url = "/jlw/teacherOpenCourseMergeScheduleSession/add.do";
+                    Common.openDlg(url,"开课关联排课配置管理>新增");
+                },
+                edit: function () {
+                    var data = Common.getOneFromTable(table,"teacherOpenCourseMergeScheduleSessionTable");
+                    if(data==null){
+                        return ;
+                    }
+                    var url = "/jlw/teacherOpenCourseMergeScheduleSession/add.do?teacherOpenCourseMergeScheduleSessionId="+data.teacherOpenCourseMergeScheduleSessionId;
+                    Common.openDlg(url,"开课关联排课配置管理>"+data.teacherOpenCourseMergeScheduleSessionId+">编辑");
+                },
+                del: function () {
+                    layui.use(['del'], function(){
+                        var delView = layui.del
+                        delView.delBatch();
+                    });
+                },
+                search: function () {
+                    Lib.doSearchForm($("#searchForm"), teacherOpenCourseMergeScheduleSessionTable, 1);
+                    view.initToolBar()
+                },
+                refresh: function () {
+                    searchForm.reset();
+                    Lib.doSearchForm($("#searchForm"), teacherOpenCourseMergeScheduleSessionTable, 1);
+                    view.initToolBar()
+                },
+                exportDocument: function () {
+                    layui.use([ 'teacherOpenCourseMergeScheduleSessionApi' ], function() {
+                        var teacherOpenCourseMergeScheduleSessionApi = layui.teacherOpenCourseMergeScheduleSessionApi
+                        Common.openConfirm("确认要导出这些开课关联排课配置数据?", function() {
+                            teacherOpenCourseMergeScheduleSessionApi.exportExcel($("#searchForm"), function(fileId) {
+                                Lib.download(fileId);
+                            })
+                        })
+                    });
+                },
+                importDocument: function () {
+                    var uploadUrl = Common.ctxPath+"/jlw/teacherOpenCourseMergeScheduleSession/importTemplate.json";
+                    //模板,
+                    var templatePath= Common.ctxPath+"/jlw/teacherOpenCourseMergeScheduleSession/downloadTemplate.json";
+                    //公共的简单上传文件处理
+                    var url = "/core/file/simpleUpload.do?uploadUrl="+uploadUrl+"&templatePath="+templatePath;
+                    Common.openDlg(url, "开课关联排课配置管理>上传");
+                }
+            }
+            //触发事件
+            $('.ext-toolbar').on('click', function() {
+                var type = $(this).data('type');
+                toolbar[type] ? toolbar[type].call(this) : '';
+            });
+
+        }, initTableTool: table.on('tool(teacherOpenCourseMergeScheduleSessionTable)', function (obj) {
+            var data = obj.data;
+            if (obj.event === 'edit') {
+                var url = "/jlw/teacherOpenCourseMergeScheduleSession/add.do?teacherOpenCourseMergeScheduleSessionId="+data.teacherOpenCourseMergeScheduleSessionId;
+                Common.openDlg(url,"开课关联排课配置管理>"+data.teacherOpenCourseMergeScheduleSessionId+">编辑");
+            }else if(obj.event === "del"){
+                layer.confirm('是否确定删除该信息？', function (index) {
+                    var ret = Common.postAjax("/jlw/teacherOpenCourseMergeScheduleSession/delete.json",{ids:data.teacherOpenCourseMergeScheduleSessionId});
+                    layer.msg(ret.code == 0?"删除成功！":ret.msg, {
+                        offset: ['50%'],
+                        icon: ret.code == 0?1:2,
+                        time: 1500 //2秒关闭（如果不配置，默认是3秒）
+                    },function (){
+                        if(ret.code == 0){
+                            Lib.tableRefresh();
+                        }
+                    });
+                });
+            }
+        })
+    }
+    exports('index',view);
+
+});

web/src/main/resources/static/js/jlw/teacherOpenCourseMergeScheduleSession/teacherOpenCourseMergeScheduleSessionApi.js

@@ -0,0 +1,26 @@
+/*访问后台的代码*/
+layui.define([], function(exports) {
+    var api={
+            updateTeacherOpenCourseMergeScheduleSession:function(form,callback){
+                Lib.submitForm("/jlw/teacherOpenCourseMergeScheduleSession/edit.json",form,{},callback)
+            },
+            addTeacherOpenCourseMergeScheduleSession:function(form,callback){
+                Lib.submitForm("/jlw/teacherOpenCourseMergeScheduleSession/add.json",form,{},callback)
+            },
+            del:function(ids,callback){
+                Common.post("/jlw/teacherOpenCourseMergeScheduleSession/delete.json",{"ids":ids},function(){
+                    callback();
+                })
+            }
+            ,
+            exportExcel:function(form,callback){
+                var formPara = form.serializeJson();
+                Common.downLoad("/jlw/teacherOpenCourseMergeScheduleSession/excel/export.json", formPara, 'POST')
+                // Common.post("/jlw/teacherOpenCourseMergeScheduleSession/excel/export.json", formPara, function(fileId) {
+                //     callback(fileId);
+                // })
+            }
+		
+    };
+    exports('teacherOpenCourseMergeScheduleSessionApi',api);
+});

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

@@ -0,0 +1,64 @@
+<!--# layout("/common/layout.html",{"jsBase":"/js/jlw/teacherOpenCourseMergeScheduleSession/"}){ -->
+
+<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">
+					<layui:simpleDictSelect style='layui-input-inline' type="teacher_open_course.teacher_open_course_title.teacher_open_course_status=1"
+											id="teacherOpenCourseId" name="teacherOpenCourseId" value="${teacherOpenCourseMergeScheduleSession.teacherOpenCourseId}" layVerify="" />
+				</div>
+            </div>
+            <div class="layui-inline">
+            	<label class="layui-form-label">课程排课配置ID</label>
+				<div class="layui-input-inline">
+					<input type="text" id="teacherOpenCourseScheduleSessionId" name="teacherOpenCourseScheduleSessionId"  value="${teacherOpenCourseMergeScheduleSession.teacherOpenCourseScheduleSessionId}"   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">添加时间</label>
+				<div class="layui-input-inline">
+					<input type="text" id="teacherOpenCourseMergeScheduleSessionAddTime" name="teacherOpenCourseMergeScheduleSessionAddTime"  value="${teacherOpenCourseMergeScheduleSession.teacherOpenCourseMergeScheduleSessionAddTime,"yyyy-MM-dd"}"   class="layui-input input-date" >
+				</div>
+            </div>
+            <div class="layui-inline">
+            	<label class="layui-form-label">状态</label>
+				<div class="layui-input-inline">
+					<layui:simpleDictSelect style='layui-input-inline' type="global_status"
+											id="teacherOpenCourseMergeScheduleSessionStatus" name="teacherOpenCourseMergeScheduleSessionStatus" value="${teacherOpenCourseMergeScheduleSession.teacherOpenCourseMergeScheduleSessionStatus}" layVerify="" />
+				</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="orgId" name="orgId"  value="${teacherOpenCourseMergeScheduleSession.orgId}"   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="userId" name="userId"  value="${teacherOpenCourseMergeScheduleSession.userId}"   class="layui-input" >
+				</div>
+            </div>
+        </div>
+    </div>
+	<!-- 业务对象须有hidden字段，保存delFlag和version字段-->
+	<input type="hidden" name="teacherOpenCourseMergeScheduleSessionId" value="${teacherOpenCourseMergeScheduleSession.teacherOpenCourseMergeScheduleSessionId}" />
+    <layui:submitButtons id="addButton" buttonType="" showExamine="2" />
+</form>
+<!--#} -->
+<script>
+layui.use(['add'], function(){
+    var teacherOpenCourseMergeScheduleSessionAdd = layui.add
+    teacherOpenCourseMergeScheduleSessionAdd.init();
+});
+</script>

web/src/main/resources/templates/jlw/teacherOpenCourseMergeScheduleSession/edit.html

@@ -0,0 +1,64 @@
+<!--# layout("/common/layout.html",{"jsBase":"/js/jlw/teacherOpenCourseMergeScheduleSession/"}){ -->
+
+<form class="layui-form" id="updateForm">
+    <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">
+					<layui:simpleDictSelect style='layui-input-inline' type="teacher_open_course.teacher_open_course_title.teacher_open_course_status=1"
+						id="teacherOpenCourseId" name="teacherOpenCourseId" value="${teacherOpenCourseMergeScheduleSession.teacherOpenCourseId}" layVerify="" />
+				</div>
+            </div>
+            <div class="layui-inline">
+            	<label class="layui-form-label">课程排课配置ID</label>
+				<div class="layui-input-inline">
+					<input type="text" id="teacherOpenCourseScheduleSessionId" name="teacherOpenCourseScheduleSessionId"  value="${teacherOpenCourseMergeScheduleSession.teacherOpenCourseScheduleSessionId}"   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">添加时间</label>
+				<div class="layui-input-inline">
+					<input type="text" id="teacherOpenCourseMergeScheduleSessionAddTime" name="teacherOpenCourseMergeScheduleSessionAddTime"  value="${teacherOpenCourseMergeScheduleSession.teacherOpenCourseMergeScheduleSessionAddTime,"yyyy-MM-dd"}"   class="layui-input input-date" >
+				</div>
+            </div>
+            <div class="layui-inline">
+            	<label class="layui-form-label">状态</label>
+				<div class="layui-input-inline">
+					<layui:simpleDictSelect style='layui-input-inline' type="global_status"
+						id="teacherOpenCourseMergeScheduleSessionStatus" name="teacherOpenCourseMergeScheduleSessionStatus" value="${teacherOpenCourseMergeScheduleSession.teacherOpenCourseMergeScheduleSessionStatus}" layVerify="" />
+				</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="orgId" name="orgId"  value="${teacherOpenCourseMergeScheduleSession.orgId}"   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="userId" name="userId"  value="${teacherOpenCourseMergeScheduleSession.userId}"   class="layui-input" >
+				</div>
+            </div>
+        </div>
+    </div>
+	<!-- 业务对象须有hidden字段，保存delFlag和version字段-->
+	<input type="hidden" name="teacherOpenCourseMergeScheduleSessionId" value="${teacherOpenCourseMergeScheduleSession.teacherOpenCourseMergeScheduleSessionId}" />
+    <layui:submitButtons id="updateButton"  buttonType="" showExamine="2" />
+</form>
+<!--#} -->
+<script>
+layui.use(['edit'], function(){
+    var teacherOpenCourseMergeScheduleSessionEdit = layui.edit
+    teacherOpenCourseMergeScheduleSessionEdit.init();
+});
+</script>

web/src/main/resources/templates/jlw/teacherOpenCourseMergeScheduleSession/index.html

@@ -0,0 +1,31 @@
+<!--#layout("/common/layout.html",{"jsBase":"/js/jlw/teacherOpenCourseMergeScheduleSession/"}){ -->
+<layui:searchForm formId="searchForm" searchList="" condition="${search}">
+</layui:searchForm>
+<table id="teacherOpenCourseMergeScheduleSessionTable" lay-filter="teacherOpenCourseMergeScheduleSessionTable"></table>
+<!--#} -->
+
+<script type="text/html" id="toolbar_teacherOpenCourseMergeScheduleSession">
+    <div class="layui-btn-container">
+        <div class="layui-btn-group" >
+            <!--# if(core.searchIsShow(search)) {-->
+            <layui:accessButton function="teacherOpenCourseMergeScheduleSession.query"  id="searchFormSearch" action="search"><i class="layui-icon">&#xe615;</i>搜索</layui:accessButton>
+            <!--# }-->
+            <layui:accessButton function="teacherOpenCourseMergeScheduleSession.add"  action="add">添加</layui:accessButton>
+            <layui:accessButton function="teacherOpenCourseMergeScheduleSession.edit"  action="edit">修改</layui:accessButton>
+            <layui:accessButton function="teacherOpenCourseMergeScheduleSession.del"  action="del">删除</layui:accessButton>
+            <!--#            if(!isEmpty(search)) {-->
+            <layui:accessButton function="teacherOpenCourseMergeScheduleSession.query"  action="refresh"><i class="layui-icon">&#xe669;</i>刷新</layui:accessButton>
+            <!--#            }-->
+            <layui:accessButton function="teacherOpenCourseMergeScheduleSession.exportDocument"  action="exportDocument">导出</layui:accessButton>
+            <layui:accessButton function="teacherOpenCourseMergeScheduleSession.importTemplate"  action="importDocument">导入</layui:accessButton>
+        </div>
+    </div>
+</script>
+<script>
+
+layui.use(['index'], function(){
+    var index = layui.index;
+    index.init();
+});
+
+</script>

web/tianze.conf

@@ -0,0 +1,33 @@
+
+server {
+	listen 8080;
+	server_name 116.205.131.177;
+	client_max_body_size 100M;
+    
+	
+	location /static/ {
+		alias  /www/wwwroot/tianze/static/;
+	}
+	
+	location / {
+       try_files $uri $uri/ @router;
+       root /www/wwwroot/tianze;
+	   index index.html index.htm;
+    }
+
+    location /server {
+       proxy_pass http://127.0.0.1:9090/server/;
+       proxy_set_header Host $proxy_host; 
+       proxy_set_header X-Real-IP $remote_addr; 
+       proxy_set_header X-Forwarded-For $remote_addr;
+       proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+       proxy_http_version 1.1;
+	   proxy_set_header Upgrade $http_upgrade;
+	   proxy_set_header Connection $connection_upgrade;
+    }
+
+    location @router {
+           rewrite ^.*$ /index.html last;
+    }
+    
+}