授课功能

tianze-pro.sql

@@ -3,15 +3,15 @@
 
  Source Server         : localhost
  Source Server Type    : MySQL
- Source Server Version : 80029
+ Source Server Version : 80022
- Source Host           : localhost:3306
+ Source Host           : 127.0.0.1:3306
  Source Schema         : tzcj
 
  Target Server Type    : MySQL
- Target Server Version : 80029
+ Target Server Version : 80022
  File Encoding         : 65001
 
- Date: 12/09/2022 16:45:53
+ Date: 12/09/2022 22:52:42
 */
 
 SET NAMES utf8mb4;
@@ -3865,6 +3865,11 @@ INSERT INTO `core_function` VALUES (1023, 'teacherOpenCourseScheduleSession.quer
 INSERT INTO `core_function` VALUES (1024, 'teacherOpenCourseScheduleSession.edit', '修改新增排课', '2022-09-11 12:08:56.668000', NULL, 1022, 'FN0');
 INSERT INTO `core_function` VALUES (1025, 'teacherOpenCourseScheduleSession.add', '添加新增排课', '2022-09-11 12:08:56.672000', NULL, 1022, 'FN0');
 INSERT INTO `core_function` VALUES (1026, 'teacherOpenCourseScheduleSession.delete', '删除新增排课', '2022-09-11 12:08:56.675000', NULL, 1022, 'FN0');
+INSERT INTO `core_function` VALUES (1032, 'teacherMergeSchoolClass', '授课', '2022-09-12 22:31:01.815000', NULL, 0, 'FN0');
+INSERT INTO `core_function` VALUES (1033, 'teacherMergeSchoolClass.query', '查询授课', '2022-09-12 22:31:01.824000', '/jlw/teacherMergeSchoolClass/index.do', 1032, 'FN1');
+INSERT INTO `core_function` VALUES (1034, 'teacherMergeSchoolClass.edit', '修改授课', '2022-09-12 22:31:01.828000', NULL, 1032, 'FN0');
+INSERT INTO `core_function` VALUES (1035, 'teacherMergeSchoolClass.add', '添加授课', '2022-09-12 22:31:01.832000', NULL, 1032, 'FN0');
+INSERT INTO `core_function` VALUES (1036, 'teacherMergeSchoolClass.delete', '删除授课', '2022-09-12 22:31:01.835000', NULL, 1032, 'FN0');
 
 -- ----------------------------
 -- Table structure for core_menu
@@ -3959,6 +3964,7 @@ INSERT INTO `core_menu` VALUES (220, '排课管理', '排课管理', '2022-09-10
 INSERT INTO `core_menu` VALUES (221, 'TeacherOpenCourseScheduleSessionTag.Manager', '课次管理', NULL, 1013, 'MENU_M', 24, 3, NULL);
 INSERT INTO `core_menu` VALUES (222, 'TeacherOpenCourseScheduleSessionClass.Manager', '排课教室管理', NULL, 1018, 'MENU_M', 24, 3, NULL);
 INSERT INTO `core_menu` VALUES (223, 'TeacherOpenCourseScheduleSession.Manager', '新增排课管理', NULL, 1023, 'MENU_M', 24, 3, NULL);
+INSERT INTO `core_menu` VALUES (225, 'TeacherMergeSchoolClass.Manager', '授课管理', NULL, 1033, 'MENU_M', 24, 3, NULL);
 
 -- ----------------------------
 -- Table structure for core_org
@@ -28381,7 +28387,7 @@ CREATE TABLE `sys_log`  (
   INDEX `token`(`token`) USING BTREE,
   INDEX `member_id`(`student_id`) USING BTREE,
   INDEX `create_time`(`create_time`) USING BTREE
-) ENGINE = InnoDB AUTO_INCREMENT = 9378 CHARACTER SET = utf8 COLLATE = utf8_general_ci COMMENT = '行为日志' ROW_FORMAT = DYNAMIC;
+) ENGINE = InnoDB AUTO_INCREMENT = 9406 CHARACTER SET = utf8 COLLATE = utf8_general_ci COMMENT = '行为日志' ROW_FORMAT = DYNAMIC;
 
 -- ----------------------------
 -- Records of sys_log
@@ -28453,6 +28459,26 @@ CREATE TABLE `teacher_merge_application`  (
 -- ----------------------------
 INSERT INTO `teacher_merge_application` VALUES (1566088348525830144, 1, 1, NULL, 1, 1, '2022-09-03 00:00:00');
 
+-- ----------------------------
+-- Table structure for teacher_merge_school_class
+-- ----------------------------
+DROP TABLE IF EXISTS `teacher_merge_school_class`;
+CREATE TABLE `teacher_merge_school_class`  (
+  `teacher_merge_school_class_id` bigint NOT NULL COMMENT '教师-班级关联ID',
+  `teacher_id` bigint NULL DEFAULT NULL COMMENT '教师ID',
+  `school_class_id` bigint NULL DEFAULT NULL COMMENT '班级ID',
+  `teacher_merge_school_class_status` int NULL DEFAULT NULL COMMENT '状态（1启用 2禁用）',
+  `teacher_merge_school_class_add_time` datetime NULL DEFAULT NULL COMMENT '创建时间',
+  `org_id` bigint NULL DEFAULT NULL COMMENT '组织ID',
+  `user_id` bigint NULL DEFAULT NULL COMMENT '用户ID',
+  PRIMARY KEY (`teacher_merge_school_class_id`) USING BTREE
+) ENGINE = InnoDB AUTO_INCREMENT = 1 CHARACTER SET = utf8 COLLATE = utf8_general_ci COMMENT = '教师-关联-班级' ROW_FORMAT = Dynamic;
+
+-- ----------------------------
+-- Records of teacher_merge_school_class
+-- ----------------------------
+INSERT INTO `teacher_merge_school_class` VALUES (1569335758928650240, 1, 3, 1, '2022-09-12 22:42:56', 1, 1);
+
 -- ----------------------------
 -- Table structure for teacher_open_course
 -- ----------------------------
@@ -29246,6 +29272,7 @@ CREATE TABLE `university_system`  (
 -- ----------------------------
 -- Records of university_system
 -- ----------------------------
+INSERT INTO `university_system` VALUES (1569331621092564992, '名字', '人', '123123123', NULL, 1, NULL, 1, 1);
 
 -- ----------------------------
 -- Table structure for wrong_question

web/src/main/java/cn/jlw/web/WebApplication.java

@@ -2,7 +2,6 @@ package cn.jlw.web;
 
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
-import org.springframework.boot.autoconfigure.aop.AopAutoConfiguration;
 import org.springframework.boot.web.embedded.tomcat.TomcatConnectorCustomizer;
 import org.springframework.boot.web.embedded.tomcat.TomcatServletWebServerFactory;
 import org.springframework.boot.web.servlet.ServletComponentScan;
@@ -11,12 +10,13 @@ import org.springframework.boot.web.servlet.support.SpringBootServletInitializer
 import org.springframework.cache.annotation.EnableCaching;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.ComponentScan;
-import org.springframework.transaction.annotation.EnableTransactionManagement;
+import org.springframework.scheduling.annotation.EnableAsync;
 import org.springframework.web.WebApplicationInitializer;
 
 
 @SpringBootApplication
 @EnableCaching
+@EnableAsync
 @ComponentScan(basePackages= {"cn.jlw","com.ibeetl.admin","com.ibeetl.jlw"})
 @ServletComponentScan(basePackages = "cn.jlw.cors")
 public class WebApplication extends SpringBootServletInitializer implements WebApplicationInitializer {

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

@@ -0,0 +1,25 @@
+package com.ibeetl.jlw.dao;
+
+import com.ibeetl.jlw.entity.TeacherMergeSchoolClass;
+import com.ibeetl.jlw.web.query.TeacherMergeSchoolClassQuery;
+import org.beetl.sql.core.annotatoin.SqlResource;
+import org.beetl.sql.core.engine.PageQuery;
+import org.beetl.sql.core.mapper.BaseMapper;
+import org.springframework.stereotype.Repository;
+
+import java.util.List;
+
+
+/**
+ * 授课 Dao
+ */
+@SqlResource("jlw.teacherMergeSchoolClass")
+@Repository
+public interface TeacherMergeSchoolClassDao extends BaseMapper<TeacherMergeSchoolClass>{
+    public PageQuery<TeacherMergeSchoolClass> queryByCondition(PageQuery query);
+    public PageQuery<TeacherMergeSchoolClass> queryByConditionQuery(PageQuery query);
+    public void deleteTeacherMergeSchoolClassByIds(String ids);
+    public int updateGivenByIds(TeacherMergeSchoolClassQuery teacherMergeSchoolClassQuery);
+    public List<TeacherMergeSchoolClass> getByIds(String ids);
+    public List<TeacherMergeSchoolClass> getValuesByQuery(TeacherMergeSchoolClassQuery teacherMergeSchoolClassQuery);
+}

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

@@ -0,0 +1,147 @@
+package com.ibeetl.jlw.entity;
+
+import com.ibeetl.admin.core.annotation.Dict;
+import com.ibeetl.admin.core.entity.BaseEntity;
+import com.ibeetl.admin.core.util.ValidateConfig;
+import org.beetl.sql.core.annotatoin.AssignID;
+import org.beetl.sql.core.annotatoin.SeqID;
+
+import javax.validation.constraints.NotNull;
+import java.util.Date;
+
+/* 
+* 教师-关联-班级
+* gen by Spring Boot2 Admin 2022-09-12
+*/
+public class TeacherMergeSchoolClass extends BaseEntity{
+
+    //教师-班级关联ID
+    @NotNull(message = "ID不能为空", groups =ValidateConfig.UPDATE.class)
+    @SeqID(name = ORACLE_CORE_SEQ_NAME)
+    @AssignID(value = "maskAutoID",param = "com.ibeetl.jlw.entity.TeacherMergeSchoolClass")
+
+    private Long teacherMergeSchoolClassId ;
+	
+    //教师ID
+    @Dict(type="teacher.teacher_name.teacher_status=1")
+
+    private Long teacherId;
+
+    //班级ID
+    @Dict(type="school_class.class_name.class_status=1")
+
+    private Long schoolClassId ;
+	
+    //状态（1启用 2禁用）
+    @Dict(type="global_open_status")
+
+    private Integer teacherMergeSchoolClassStatus ;
+	
+    //创建时间
+
+    private Date teacherMergeSchoolClassAddTime ;
+	
+    //组织ID
+
+    private Long orgId ;
+	
+    //用户ID
+
+    private Long userId ;
+	
+    public TeacherMergeSchoolClass(){
+    }
+
+    /**教师-班级关联ID
+    *@return 
+    */
+    public Long getTeacherMergeSchoolClassId(){
+        return  teacherMergeSchoolClassId;
+    }
+    /**教师-班级关联ID
+    *@param  teacherMergeSchoolClassId
+    */
+    public void setTeacherMergeSchoolClassId(Long teacherMergeSchoolClassId){
+        this.teacherMergeSchoolClassId = teacherMergeSchoolClassId;
+    }
+
+    /**教师ID
+    *@return 
+    */
+    public Long getTeacherId(){
+        return  teacherId;
+    }
+    /**教师ID
+    *@param  teacherId
+    */
+    public void setTeacherId(Long teacherId){
+        this.teacherId = teacherId;
+    }
+
+    /**班级ID
+    *@return 
+    */
+    public Long getSchoolClassId(){
+        return  schoolClassId;
+    }
+    /**班级ID
+    *@param  schoolClassId
+    */
+    public void setSchoolClassId(Long schoolClassId){
+        this.schoolClassId = schoolClassId;
+    }
+
+    /**状态（1启用 2禁用）
+    *@return 
+    */
+    public Integer getTeacherMergeSchoolClassStatus(){
+        return  teacherMergeSchoolClassStatus;
+    }
+    /**状态（1启用 2禁用）
+    *@param  teacherMergeSchoolClassStatus
+    */
+    public void setTeacherMergeSchoolClassStatus(Integer teacherMergeSchoolClassStatus){
+        this.teacherMergeSchoolClassStatus = teacherMergeSchoolClassStatus;
+    }
+
+    /**创建时间
+    *@return 
+    */
+    public Date getTeacherMergeSchoolClassAddTime(){
+        return  teacherMergeSchoolClassAddTime;
+    }
+    /**创建时间
+    *@param  teacherMergeSchoolClassAddTime
+    */
+    public void setTeacherMergeSchoolClassAddTime(Date teacherMergeSchoolClassAddTime){
+        this.teacherMergeSchoolClassAddTime = teacherMergeSchoolClassAddTime;
+    }
+
+    /**组织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;
+    }
+
+
+}

web/src/main/java/com/ibeetl/jlw/job/RefreshAuthCodeJob.java

@@ -5,6 +5,7 @@ import lombok.extern.slf4j.Slf4j;
 import org.quartz.Job;
 import org.quartz.JobExecutionContext;
 import org.quartz.JobExecutionException;
+import org.springframework.scheduling.annotation.Async;
 import org.springframework.stereotype.Component;
 
 import javax.annotation.PostConstruct;
@@ -44,6 +45,7 @@ public class RefreshAuthCodeJob implements Job {
      * 每次系统启动更新，为动态授权码null的数据
      */
     @PostConstruct
+    @Async
     public void updateAuthCodeNullData() {
         int upNum = universitiesCollegesService.refreshUniversitiesCollegesAuthCode(true);
         log.info("院校为空的授权码，刷新成功, 共更新：{} 行数据", upNum);

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

@@ -0,0 +1,149 @@
+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.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.TeacherMergeSchoolClassDao;
+import com.ibeetl.jlw.entity.TeacherMergeSchoolClass;
+import com.ibeetl.jlw.web.query.TeacherMergeSchoolClassQuery;
+import org.apache.commons.lang3.StringUtils;
+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 java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+
+
+/**
+ * 授课 Service
+ * 当分布式ID开启后请勿使用insert(*,true)
+ */
+
+@Service
+@Transactional
+public class TeacherMergeSchoolClassService extends CoreBaseService<TeacherMergeSchoolClass>{
+
+    @Autowired private TeacherMergeSchoolClassDao teacherMergeSchoolClassDao;
+
+    public PageQuery<TeacherMergeSchoolClass>queryByCondition(PageQuery query){
+        PageQuery ret =  teacherMergeSchoolClassDao.queryByCondition(query);
+        queryListAfter(ret.getList());
+        return ret;
+    }
+
+    public PageQuery<TeacherMergeSchoolClass>queryByConditionQuery(PageQuery query){
+        PageQuery ret =  teacherMergeSchoolClassDao.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)){
+            teacherMergeSchoolClassDao.deleteTeacherMergeSchoolClassByIds(ids);
+        }
+    }
+
+    public void deleteTeacherMergeSchoolClass(String ids){
+        try {
+            teacherMergeSchoolClassDao.deleteTeacherMergeSchoolClassByIds(ids);
+        } catch (Exception e) {
+            throw new PlatformException("批量删除授课失败", e);
+        }
+    }
+
+    public String addAll(TeacherMergeSchoolClassQuery teacherMergeSchoolClassQuery){
+        String msg = "";
+        List<TeacherMergeSchoolClass> teacherMergeSchoolClassList = new ArrayList<>();
+        try {
+            teacherMergeSchoolClassList = JSON.parseArray(teacherMergeSchoolClassQuery.getTeacherMergeSchoolClassJsonStr(), TeacherMergeSchoolClass.class);
+        } catch (Exception e) {
+            try {
+                teacherMergeSchoolClassList.add(JSONObject.parseObject(teacherMergeSchoolClassQuery.getTeacherMergeSchoolClassJsonStr(), TeacherMergeSchoolClass.class));
+            } catch (Exception e1) {}
+        }
+        ToolUtils.deleteNullList(teacherMergeSchoolClassList);
+        if(null != teacherMergeSchoolClassList && teacherMergeSchoolClassList.size()>0){
+            for(int i=0;i<teacherMergeSchoolClassList.size();i++){
+                TeacherMergeSchoolClass teacherMergeSchoolClass = teacherMergeSchoolClassList.get(i);
+                teacherMergeSchoolClass.setUserId(teacherMergeSchoolClassQuery.getUserId());
+                teacherMergeSchoolClass.setOrgId(teacherMergeSchoolClassQuery.getOrgId());
+            }
+            insertBatch(teacherMergeSchoolClassList);
+        }
+        return msg;
+    }
+
+    public JsonResult add(TeacherMergeSchoolClassQuery teacherMergeSchoolClassQuery){
+        String msg = "";
+        TeacherMergeSchoolClass teacherMergeSchoolClass = teacherMergeSchoolClassQuery.pojo();
+        teacherMergeSchoolClass.setTeacherMergeSchoolClassAddTime(new Date());
+        teacherMergeSchoolClassDao.insert(teacherMergeSchoolClass);
+        teacherMergeSchoolClassQuery.setTeacherMergeSchoolClassId(teacherMergeSchoolClass.getTeacherMergeSchoolClassId());
+        JsonResult jsonResult = new JsonResult();
+        jsonResult.setData(teacherMergeSchoolClass.getTeacherMergeSchoolClassId());//自增的ID丢进去
+        jsonResult.setCode(JsonReturnCode.SUCCESS.getCode());
+        jsonResult.setMsg(msg);
+        return jsonResult;
+    }
+
+    public String edit(TeacherMergeSchoolClassQuery teacherMergeSchoolClassQuery){
+        String msg = "";
+        TeacherMergeSchoolClass teacherMergeSchoolClass = teacherMergeSchoolClassQuery.pojo();
+        teacherMergeSchoolClassDao.updateTemplateById(teacherMergeSchoolClass);
+        return msg;
+    }
+
+    public String updateGivenByIds(TeacherMergeSchoolClassQuery teacherMergeSchoolClassQuery){
+        String msg = "";
+        if(StringUtils.isNotBlank(teacherMergeSchoolClassQuery.get_given())){
+            boolean flag = teacherMergeSchoolClassDao.updateGivenByIds(teacherMergeSchoolClassQuery) > 0;
+            if(!flag){
+                msg = "更新指定参数失败";
+            }
+        }else{
+            msg = "指定参数为空";
+        }
+        return msg;
+    }
+
+    public List<TeacherMergeSchoolClass> getValues (Object paras){
+        return sqlManager.select("jlw.teacherMergeSchoolClass.getTeacherMergeSchoolClassValues",TeacherMergeSchoolClass.class,paras);
+    }
+
+    public List<TeacherMergeSchoolClass> getValuesByQuery (TeacherMergeSchoolClassQuery teacherMergeSchoolClassQuery){
+        return teacherMergeSchoolClassDao.getValuesByQuery(teacherMergeSchoolClassQuery);
+    }
+
+    public TeacherMergeSchoolClass getInfo (Long teacherMergeSchoolClassId){
+        TeacherMergeSchoolClassQuery teacherMergeSchoolClassQuery = new TeacherMergeSchoolClassQuery();
+        teacherMergeSchoolClassQuery.setTeacherMergeSchoolClassId(teacherMergeSchoolClassId);
+        List<TeacherMergeSchoolClass> list = teacherMergeSchoolClassDao.getValuesByQuery(teacherMergeSchoolClassQuery);
+        if(null != list && list.size()>0){
+            return list.get(0);
+        }else{
+            return null;
+        }
+    }
+
+    public TeacherMergeSchoolClass getInfo (TeacherMergeSchoolClassQuery teacherMergeSchoolClassQuery){
+        List<TeacherMergeSchoolClass> list = teacherMergeSchoolClassDao.getValuesByQuery(teacherMergeSchoolClassQuery);
+        if(null != list && list.size()>0){
+            return list.get(0);
+        }else{
+            return null;
+        }
+    }
+
+}

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

@@ -0,0 +1,206 @@
+package com.ibeetl.jlw.web;
+
+import cn.jlw.Interceptor.SCoreUser;
+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.web.JsonResult;
+import com.ibeetl.jlw.entity.TeacherMergeSchoolClass;
+import com.ibeetl.jlw.service.TeacherMergeSchoolClassService;
+import com.ibeetl.jlw.web.query.TeacherMergeSchoolClassQuery;
+import org.apache.commons.lang3.StringUtils;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.beetl.sql.core.engine.PageQuery;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Controller;
+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.servlet.ModelAndView;
+
+import java.util.List;
+
+/**
+ * 授课 教师-关联-班级 接口
+ * 切记不要对非线程安全的静态变量进行写操作
+ */
+
+@Controller
+public class TeacherMergeSchoolClassController{
+
+    private final Log log = LogFactory.getLog(this.getClass());
+    private static final String MODEL = "/jlw/teacherMergeSchoolClass";
+    private static final String API = "/api/teacherMergeSchoolClass";
+
+
+    @Autowired private TeacherMergeSchoolClassService teacherMergeSchoolClassService;
+
+    @Autowired
+    FileService fileService;
+
+    /* 前端接口 */
+
+    @PostMapping(API + "/getPageList.do")
+    @ResponseBody
+    public JsonResult<PageQuery> getPageList(TeacherMergeSchoolClassQuery condition,@SCoreUser CoreUser coreUser){
+        if(null == coreUser){
+            return JsonResult.failMessage("请登录后再操作");
+        }else{
+            PageQuery page = condition.getPageQuery();
+            teacherMergeSchoolClassService.queryByConditionQuery(page);
+            return JsonResult.success(page);
+        }
+    }
+
+
+    @GetMapping(API + "/getInfo.do")
+    @ResponseBody
+    public JsonResult<TeacherMergeSchoolClass>getInfo(TeacherMergeSchoolClassQuery param,@SCoreUser CoreUser coreUser) {
+        if(null == coreUser){
+            return JsonResult.failMessage("请登录后再操作");
+        }else{
+            TeacherMergeSchoolClass teacherMergeSchoolClass = teacherMergeSchoolClassService.getInfo(param);
+            return  JsonResult.success(teacherMergeSchoolClass);
+        }
+    }
+
+
+    @GetMapping(API + "/getList.do")
+    @ResponseBody
+    public JsonResult<List<TeacherMergeSchoolClass>>getList(TeacherMergeSchoolClassQuery param,@SCoreUser CoreUser coreUser) {
+        if(null == coreUser){
+            return JsonResult.failMessage("请登录后再操作");
+        }else{
+            List<TeacherMergeSchoolClass>list = teacherMergeSchoolClassService.getValuesByQuery(param);
+            return  JsonResult.success(list);
+        }
+    }
+
+
+    /* 后台页面 */
+
+    @GetMapping(MODEL + "/index.do")
+    @Function("teacherMergeSchoolClass.query")
+    @ResponseBody
+    public ModelAndView index() {
+        ModelAndView view = new ModelAndView("/jlw/teacherMergeSchoolClass/index.html") ;
+        view.addObject("search", TeacherMergeSchoolClassQuery.class.getName());
+        return view;
+    }
+
+    @GetMapping(MODEL + "/edit.do")
+    @Function("teacherMergeSchoolClass.edit")
+    @ResponseBody
+    public ModelAndView edit(Long teacherMergeSchoolClassId) {
+        ModelAndView view = new ModelAndView("/jlw/teacherMergeSchoolClass/edit.html");
+        TeacherMergeSchoolClass teacherMergeSchoolClass = teacherMergeSchoolClassService.queryById(teacherMergeSchoolClassId);
+        view.addObject("teacherMergeSchoolClass", teacherMergeSchoolClass);
+        return view;
+    }
+
+    @GetMapping(MODEL + "/add.do")
+    @Function("teacherMergeSchoolClass.add")
+    @ResponseBody
+    public ModelAndView add(Long teacherMergeSchoolClassId) {
+        ModelAndView view = new ModelAndView("/jlw/teacherMergeSchoolClass/add.html");
+        if(null != teacherMergeSchoolClassId){
+            TeacherMergeSchoolClass teacherMergeSchoolClass = teacherMergeSchoolClassService.queryById(teacherMergeSchoolClassId);
+            view.addObject("teacherMergeSchoolClass", teacherMergeSchoolClass);
+        }else {
+            view.addObject("teacherMergeSchoolClass", new TeacherMergeSchoolClass());
+        }
+        return view;
+    }
+
+    /* 后台接口 */
+
+    @PostMapping(MODEL + "/list.json")
+    @Function("teacherMergeSchoolClass.query")
+    @ResponseBody
+    public JsonResult<PageQuery> list(TeacherMergeSchoolClassQuery condition){
+        PageQuery page = condition.getPageQuery();
+        teacherMergeSchoolClassService.queryByCondition(page);
+        return JsonResult.success(page);
+    }
+
+    @PostMapping(MODEL + "/addAll.json")
+    @Function("teacherMergeSchoolClass.add")
+    @ResponseBody
+    public JsonResult addAll(TeacherMergeSchoolClassQuery teacherMergeSchoolClassQuery,@SCoreUser CoreUser coreUser){
+        if(null == coreUser){
+            return JsonResult.failMessage("请登录后再操作");
+        }else{
+            teacherMergeSchoolClassQuery.setUserId(coreUser.getId());
+            teacherMergeSchoolClassQuery.setOrgId(coreUser.getOrgId());
+            String msg = teacherMergeSchoolClassService.addAll(teacherMergeSchoolClassQuery);
+            if (StringUtils.isBlank(msg)) {
+                return JsonResult.success();
+            } else {
+                return JsonResult.failMessage("新增失败,"+msg);
+            }
+        }
+    }
+
+    @PostMapping(MODEL + "/add.json")
+    @Function("teacherMergeSchoolClass.add")
+    @ResponseBody
+    public JsonResult add(@Validated(ValidateConfig.ADD.class) TeacherMergeSchoolClassQuery teacherMergeSchoolClassQuery, BindingResult result,@SCoreUser CoreUser coreUser){
+        if(result.hasErrors()){
+            return JsonResult.failMessage(result);
+        }else{
+            teacherMergeSchoolClassQuery.setUserId(coreUser.getId());
+            teacherMergeSchoolClassQuery.setOrgId(coreUser.getOrgId());
+            return teacherMergeSchoolClassService.add(teacherMergeSchoolClassQuery);
+        }
+    }
+
+    @PostMapping(MODEL + "/edit.json")
+    @Function("teacherMergeSchoolClass.edit")
+    @ResponseBody
+    public JsonResult<String> update(@Validated(ValidateConfig.UPDATE.class) TeacherMergeSchoolClassQuery teacherMergeSchoolClassQuery, BindingResult result) {
+        if(result.hasErrors()){
+            return JsonResult.failMessage(result);
+        }else {
+            teacherMergeSchoolClassQuery.setUserId(null);
+            teacherMergeSchoolClassQuery.setOrgId(null);
+            String msg = teacherMergeSchoolClassService.edit(teacherMergeSchoolClassQuery);
+            if (StringUtils.isBlank(msg)) {
+                return JsonResult.success();
+            } else {
+                return JsonResult.failMessage("更新失败,"+msg);
+            }
+        }
+    }
+
+
+    @GetMapping(MODEL + "/view.json")
+    @Function("teacherMergeSchoolClass.query")
+    @ResponseBody
+    public JsonResult<TeacherMergeSchoolClass>queryInfo(Long teacherMergeSchoolClassId) {
+        TeacherMergeSchoolClass teacherMergeSchoolClass = teacherMergeSchoolClassService.queryById( teacherMergeSchoolClassId);
+        return  JsonResult.success(teacherMergeSchoolClass);
+    }
+
+    @GetMapping(MODEL + "/getValues.json")
+    @Function("teacherMergeSchoolClass.query")
+    @ResponseBody
+    public JsonResult<List<TeacherMergeSchoolClass>>getValues(TeacherMergeSchoolClassQuery param) {
+        List<TeacherMergeSchoolClass>list = teacherMergeSchoolClassService.getValuesByQuery(param);
+        return  JsonResult.success(list);
+    }
+
+
+    @PostMapping(MODEL + "/delete.json")
+    @Function("teacherMergeSchoolClass.delete")
+    @ResponseBody
+    public JsonResult delete(String ids) {
+        teacherMergeSchoolClassService.deleteTeacherMergeSchoolClass(ids);
+        return JsonResult.success();
+    }
+
+
+}

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

@@ -0,0 +1,148 @@
+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.TeacherMergeSchoolClass;
+
+import javax.validation.constraints.NotNull;
+import java.util.Date;
+
+import static com.ibeetl.admin.core.util.enums.CoreDictType.GLOBAL_OPEN_STATUS;
+
+/**
+ *授课查询
+ */
+public class TeacherMergeSchoolClassQuery extends PageParam {
+    @NotNull(message = "ID不能为空", groups =ValidateConfig.UPDATE.class)
+    @Query(name = "教师-班级关联ID", display = false)
+    private Long teacherMergeSchoolClassId;
+    @Query(name = "教师", display = true,type=Query.TYPE_DICT,dict="teacher.teacher_name.teacher_status=1")
+    private Long teacherId;
+    @Query(name = "班级", display = true,type=Query.TYPE_DICT,dict="school_class.class_name.class_status=1")
+    private Long schoolClassId;
+//    @Query(name = "状态（1启用 2禁用）", display = true,type=Query.TYPE_DICT,dict="global_open_status")
+    @Query(name = "状态", display = true,type=Query.TYPE_DICT,dict=GLOBAL_OPEN_STATUS)
+    private Integer teacherMergeSchoolClassStatus;
+    @Query(name = "创建时间", display = false)
+    private Date teacherMergeSchoolClassAddTime;
+    @Query(name = "组织ID", display = false)
+    private Long orgId;
+    @Query(name = "用户ID", display = false)
+    private Long userId;
+
+    private String teacherMergeSchoolClassIdPlural;
+    private String teacherIdPlural;
+    private String schoolClassIdPlural;
+    private String teacherMergeSchoolClassStatusPlural;
+    private String orgIdPlural;
+    private String userIdPlural;
+
+    private String teacherMergeSchoolClassJsonStr;//json格式
+
+    private String _given;//指定更新的特定字段，多个逗号隔开
+
+    public Long getTeacherMergeSchoolClassId(){
+        return  teacherMergeSchoolClassId;
+    }
+    public void setTeacherMergeSchoolClassId(Long teacherMergeSchoolClassId ){
+        this.teacherMergeSchoolClassId = teacherMergeSchoolClassId;
+    }
+    public Long getTeacherId(){
+        return  teacherId;
+    }
+    public void setTeacherId(Long teacherId ){
+        this.teacherId = teacherId;
+    }
+    public Long getSchoolClassId(){
+        return  schoolClassId;
+    }
+    public void setSchoolClassId(Long schoolClassId ){
+        this.schoolClassId = schoolClassId;
+    }
+    public Integer getTeacherMergeSchoolClassStatus(){
+        return  teacherMergeSchoolClassStatus;
+    }
+    public void setTeacherMergeSchoolClassStatus(Integer teacherMergeSchoolClassStatus ){
+        this.teacherMergeSchoolClassStatus = teacherMergeSchoolClassStatus;
+    }
+    public Date getTeacherMergeSchoolClassAddTime(){
+        return  teacherMergeSchoolClassAddTime;
+    }
+    public void setTeacherMergeSchoolClassAddTime(Date teacherMergeSchoolClassAddTime ){
+        this.teacherMergeSchoolClassAddTime = teacherMergeSchoolClassAddTime;
+    }
+    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 TeacherMergeSchoolClass pojo(){
+        TeacherMergeSchoolClass pojo = new TeacherMergeSchoolClass();
+        pojo.setTeacherMergeSchoolClassId(this.getTeacherMergeSchoolClassId());
+        pojo.setTeacherId(this.getTeacherId());
+        pojo.setSchoolClassId(this.getSchoolClassId());
+        pojo.setTeacherMergeSchoolClassStatus(this.getTeacherMergeSchoolClassStatus());
+        pojo.setTeacherMergeSchoolClassAddTime(this.getTeacherMergeSchoolClassAddTime());
+        pojo.setOrgId(this.getOrgId());
+        pojo.setUserId(this.getUserId());
+        return pojo;
+    }
+
+    public String getTeacherMergeSchoolClassIdPlural(){
+        return  teacherMergeSchoolClassIdPlural;
+    }
+    public void setTeacherMergeSchoolClassIdPlural(String teacherMergeSchoolClassIdPlural){
+        this.teacherMergeSchoolClassIdPlural = teacherMergeSchoolClassIdPlural;
+    }
+    public String getTeacherIdPlural(){
+        return  teacherIdPlural;
+    }
+    public void setTeacherIdPlural(String teacherIdPlural){
+        this.teacherIdPlural = teacherIdPlural;
+    }
+    public String getSchoolClassIdPlural(){
+        return  schoolClassIdPlural;
+    }
+    public void setSchoolClassIdPlural(String schoolClassIdPlural){
+        this.schoolClassIdPlural = schoolClassIdPlural;
+    }
+    public String getTeacherMergeSchoolClassStatusPlural(){
+        return  teacherMergeSchoolClassStatusPlural;
+    }
+    public void setTeacherMergeSchoolClassStatusPlural(String teacherMergeSchoolClassStatusPlural){
+        this.teacherMergeSchoolClassStatusPlural = teacherMergeSchoolClassStatusPlural;
+    }
+    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 getTeacherMergeSchoolClassJsonStr(){
+        return  teacherMergeSchoolClassJsonStr;
+    }
+    public void setTeacherMergeSchoolClassJsonStr(String teacherMergeSchoolClassJsonStr ){
+        this.teacherMergeSchoolClassJsonStr = teacherMergeSchoolClassJsonStr;
+    }
+    public String get_given() {
+        return _given;
+    }
+    public void set_given(String _given) {
+        this._given = _given;
+    }
+}

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

@@ -0,0 +1,256 @@
+queryByCondition
+===
+* 根据不为空的参数进行分页查询
+
+    select 
+    @pageTag(){
+    t.*
+    @}
+    from teacher_merge_school_class t
+    where 1=1  
+    @//数据权限，该sql语句功能点,如果不考虑数据权限，可以删除此行  
+    and #function("teacherMergeSchoolClass.query")#
+    @if(!isEmpty(teacherMergeSchoolClassId)){
+        and t.teacher_merge_school_class_id =#teacherMergeSchoolClassId#
+    @}
+    @if(!isEmpty(teacherMergeSchoolClassIdPlural)){
+        and find_in_set(t.teacher_merge_school_class_id,#teacherMergeSchoolClassIdPlural#)
+    @}
+    @if(!isEmpty(teacherId)){
+        and t.teacher_id =#teacherId#
+    @}
+    @if(!isEmpty(teacherIdPlural)){
+        and find_in_set(t.teacher_id,#teacherIdPlural#)
+    @}
+    @if(!isEmpty(schoolClassId)){
+        and t.school_class_id =#schoolClassId#
+    @}
+    @if(!isEmpty(schoolClassIdPlural)){
+        and find_in_set(t.school_class_id,#schoolClassIdPlural#)
+    @}
+    @if(!isEmpty(teacherMergeSchoolClassStatus)){
+        and t.teacher_merge_school_class_status =#teacherMergeSchoolClassStatus#
+    @}
+    @if(!isEmpty(teacherMergeSchoolClassStatusPlural)){
+        and find_in_set(t.teacher_merge_school_class_status,#teacherMergeSchoolClassStatusPlural#)
+    @}
+    @if(!isEmpty(teacherMergeSchoolClassAddTime)){
+        and t.teacher_merge_school_class_add_time =#teacherMergeSchoolClassAddTime#
+    @}
+    @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_merge_school_class t
+    where 1=1  
+    @if(!isEmpty(teacherMergeSchoolClassId)){
+        and t.teacher_merge_school_class_id =#teacherMergeSchoolClassId#
+    @}
+    @if(!isEmpty(teacherMergeSchoolClassIdPlural)){
+        and find_in_set(t.teacher_merge_school_class_id,#teacherMergeSchoolClassIdPlural#)
+    @}
+    @if(!isEmpty(teacherId)){
+        and t.teacher_id =#teacherId#
+    @}
+    @if(!isEmpty(teacherIdPlural)){
+        and find_in_set(t.teacher_id,#teacherIdPlural#)
+    @}
+    @if(!isEmpty(schoolClassId)){
+        and t.school_class_id =#schoolClassId#
+    @}
+    @if(!isEmpty(schoolClassIdPlural)){
+        and find_in_set(t.school_class_id,#schoolClassIdPlural#)
+    @}
+    @if(!isEmpty(teacherMergeSchoolClassStatus)){
+        and t.teacher_merge_school_class_status =#teacherMergeSchoolClassStatus#
+    @}
+    @if(!isEmpty(teacherMergeSchoolClassStatusPlural)){
+        and find_in_set(t.teacher_merge_school_class_status,#teacherMergeSchoolClassStatusPlural#)
+    @}
+    @if(!isEmpty(teacherMergeSchoolClassAddTime)){
+        and t.teacher_merge_school_class_add_time =#teacherMergeSchoolClassAddTime#
+    @}
+    @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#)
+    @}
+    
+    
+    
+
+deleteTeacherMergeSchoolClassByIds
+===
+
+* 批量删除
+
+    delete from teacher_merge_school_class where find_in_set(teacher_merge_school_class_id,#ids#)
+    
+
+
+getByIds
+===
+
+   select * from teacher_merge_school_class where find_in_set(teacher_merge_school_class_id,#ids#)
+
+
+updateGivenByIds
+===
+
+* 批量更新指定字段，无论此字段是否有值
+
+    update teacher_merge_school_class
+    set 
+    @if(contain("teacherId",_given)){
+        @if(isEmpty(teacherId)){
+            teacher_id = null ,
+        @}else{
+            teacher_id = #teacherId# ,
+        @}
+    @}
+    @if(contain("schoolClassId",_given)){
+        @if(isEmpty(schoolClassId)){
+            school_class_id = null ,
+        @}else{
+            school_class_id = #schoolClassId# ,
+        @}
+    @}
+    @if(contain("teacherMergeSchoolClassStatus",_given)){
+        @if(isEmpty(teacherMergeSchoolClassStatus)){
+            teacher_merge_school_class_status = null ,
+        @}else{
+            teacher_merge_school_class_status = #teacherMergeSchoolClassStatus# ,
+        @}
+    @}
+    @if(contain("teacherMergeSchoolClassAddTime",_given)){
+        @if(isEmpty(teacherMergeSchoolClassAddTime)){
+            teacher_merge_school_class_add_time = null ,
+        @}else{
+            teacher_merge_school_class_add_time = #teacherMergeSchoolClassAddTime# ,
+        @}
+    @}
+    @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_merge_school_class_id = teacher_merge_school_class_id
+    where find_in_set(teacher_merge_school_class_id,#teacherMergeSchoolClassIdPlural#)
+
+    
+    
+getTeacherMergeSchoolClassValues
+===
+
+* 根据不为空的参数进行查询
+
+    select t.*
+    from teacher_merge_school_class t
+    where 1=1  
+    @if(!isEmpty(teacherMergeSchoolClassId)){
+        and t.teacher_merge_school_class_id =#teacherMergeSchoolClassId#
+    @}
+    @if(!isEmpty(teacherId)){
+        and t.teacher_id =#teacherId#
+    @}
+    @if(!isEmpty(schoolClassId)){
+        and t.school_class_id =#schoolClassId#
+    @}
+    @if(!isEmpty(teacherMergeSchoolClassStatus)){
+        and t.teacher_merge_school_class_status =#teacherMergeSchoolClassStatus#
+    @}
+    @if(!isEmpty(teacherMergeSchoolClassAddTime)){
+        and t.teacher_merge_school_class_add_time =#teacherMergeSchoolClassAddTime#
+    @}
+    @if(!isEmpty(orgId)){
+        and t.org_id =#orgId#
+    @}
+    @if(!isEmpty(userId)){
+        and t.user_id =#userId#
+    @}
+   
+    
+getValuesByQuery
+===
+
+* 根据不为空的参数进行查询
+
+    select t.*
+    from teacher_merge_school_class t
+    where 1=1 and #function("teacherMergeSchoolClass.query")#
+    @if(!isEmpty(teacherMergeSchoolClassId)){
+        and t.teacher_merge_school_class_id =#teacherMergeSchoolClassId#
+    @}
+    @if(!isEmpty(teacherMergeSchoolClassIdPlural)){
+        and find_in_set(t.teacher_merge_school_class_id,#teacherMergeSchoolClassIdPlural#)
+    @}
+    @if(!isEmpty(teacherId)){
+        and t.teacher_id =#teacherId#
+    @}
+    @if(!isEmpty(teacherIdPlural)){
+        and find_in_set(t.teacher_id,#teacherIdPlural#)
+    @}
+    @if(!isEmpty(schoolClassId)){
+        and t.school_class_id =#schoolClassId#
+    @}
+    @if(!isEmpty(schoolClassIdPlural)){
+        and find_in_set(t.school_class_id,#schoolClassIdPlural#)
+    @}
+    @if(!isEmpty(teacherMergeSchoolClassStatus)){
+        and t.teacher_merge_school_class_status =#teacherMergeSchoolClassStatus#
+    @}
+    @if(!isEmpty(teacherMergeSchoolClassStatusPlural)){
+        and find_in_set(t.teacher_merge_school_class_status,#teacherMergeSchoolClassStatusPlural#)
+    @}
+    @if(!isEmpty(teacherMergeSchoolClassAddTime)){
+        and t.teacher_merge_school_class_add_time =#teacherMergeSchoolClassAddTime#
+    @}
+    @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#)
+    @}
+       
+    
+    

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

@@ -0,0 +1,38 @@
+layui.define([ 'form', 'laydate', 'table','teacherMergeSchoolClassApi'], function(exports) {
+    var form = layui.form;
+    var teacherMergeSchoolClassApi = layui.teacherMergeSchoolClassApi;
+    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 teacherMergeSchoolClassId = $("#addForm input[name='teacherMergeSchoolClassId']").val();
+                     if(!$.isEmpty(teacherMergeSchoolClassId)){
+                         teacherMergeSchoolClassApi.updateTeacherMergeSchoolClass($('#addForm'),function(){
+                             parent.window.dataReload();
+                             Common.info("更新成功");
+                             Lib.closeFrame();
+                         });
+                     }else{
+                         teacherMergeSchoolClassApi.addTeacherMergeSchoolClass($('#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/teacherMergeSchoolClass/del.js

@@ -0,0 +1,23 @@
+layui.define(['table', 'teacherMergeSchoolClassApi'], function(exports) {
+    var teacherMergeSchoolClassApi = layui.teacherMergeSchoolClassApi;
+    var table=layui.table;
+    var view = {
+        init:function(){
+        },
+        delBatch:function(){
+            var data = Common.getMoreDataFromTable(table,"teacherMergeSchoolClassTable");
+            if(data==null){
+                return ;
+            }
+            Common.openConfirm("确认要删除这些授课?",function(){
+            var ids =Common.concatBatchId(data,"teacherMergeSchoolClassId");
+            teacherMergeSchoolClassApi.del(ids,function(){
+                Common.info("删除成功");
+                    dataReload();
+                })
+            })
+        }
+    }
+    exports('del',view);
+	
+});

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

@@ -0,0 +1,28 @@
+layui.define([ 'form', 'laydate', 'table','teacherMergeSchoolClassApi'], function(exports) {
+    var form = layui.form;
+    var teacherMergeSchoolClassApi = layui.teacherMergeSchoolClassApi;
+    var index = layui.index;
+    var view = {
+        init:function(){
+	        Lib.initGenrealForm($("#updateForm"),form);
+	        this.initSubmit();
+        },
+        initSubmit:function(){
+            $("#updateButton").click(function(){
+                form.on('submit(form)', function(){
+                    teacherMergeSchoolClassApi.updateTeacherMergeSchoolClass($('#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/teacherMergeSchoolClass/index.js

@@ -0,0 +1,148 @@
+layui.define([ 'form', 'laydate', 'table' ], function(exports) {
+    var form = layui.form;
+    var laydate = layui.laydate;
+    var table = layui.table;
+    var teacherMergeSchoolClassTable = null;
+    var view ={
+        init:function(){
+            var that = this
+            this.initTable();
+            this.initSearchForm();
+            this.initToolBar();
+            window.dataReload = function(){
+                Lib.doSearchForm($("#searchForm"),teacherMergeSchoolClassTable)
+                that.initToolBar();
+            }
+        },
+        initTable:function(){
+            var sx_ = localStorage.getItem("teacherMergeSchoolClassTable_field_"+Common.userInfoId); //筛选值显示、隐藏缓存
+            if($.isEmpty(sx_)){sx_ = {};}else {sx_ = JSON.parse(sx_);}
+            teacherMergeSchoolClassTable = table.render({
+                elem : '#teacherMergeSchoolClassTable',
+                height : Lib.getTableHeight(1),
+                cellMinWidth: 100,
+                method : 'post',
+                url : Common.ctxPath + '/jlw/teacherMergeSchoolClass/list.json' // 数据接口
+                ,page : Lib.tablePage // 开启分页
+                ,toolbar: '#toolbar_teacherMergeSchoolClass' //自定义头部左侧工具栏
+                ,defaultToolbar: ['filter', 'print', 'exports'] //头部右侧工具栏
+                ,limit : 10,
+                cols : [ [ // 表头
+                    {
+                        type : 'checkbox',
+
+                    },
+                {
+                    field : 'teacherIdText',
+                    title : '教师名称',
+                    align:"center",
+                    hideField :false,
+                    hide:$.isEmpty(sx_['teacherIdText'])?false:sx_['teacherIdText'],
+                },
+                {
+                    field : 'schoolClassIdText',
+                    title : '班级名称',
+                    align:"center",
+                    hideField :false,
+                    hide:$.isEmpty(sx_['schoolClassIdText'])?false:sx_['schoolClassIdText'],
+                },
+                {
+                    field : 'teacherMergeSchoolClassStatusText', //数据字典类型为 global_open_status
+                    title : '状态',
+                    // title : '状态（1启用 2禁用）',
+                    align:"center",
+                    hideField :false,
+                    hide:$.isEmpty(sx_['teacherMergeSchoolClassStatusText'])?false:sx_['teacherMergeSchoolClassStatusText'],
+                },
+                {
+                    field : 'teacherMergeSchoolClassAddTime', 
+                    title : '创建时间',
+                    hideField :false,
+                    hide:$.isEmpty(sx_['teacherMergeSchoolClassAddTime'])?false:sx_['teacherMergeSchoolClassAddTime'],
+                },
+                {
+                    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(teacherMergeSchoolClassTable)', function(obj){
+                var teacherMergeSchoolClass = obj.data;
+                if(obj.checked){
+                    //按钮逻辑Lib.buttonEnable()
+                }else{
+
+                }
+            })
+        },
+
+        initSearchForm:function(){
+            Lib.initSearchForm( $("#searchForm"),teacherMergeSchoolClassTable,form);
+        },
+
+        initToolBar:function(){
+            toolbar = {
+                add: function () {
+                    var url = "/jlw/teacherMergeSchoolClass/add.do";
+                    Common.openDlg(url,"授课管理>新增");
+                },
+                edit: function () {
+                    var data = Common.getOneFromTable(table,"teacherMergeSchoolClassTable");
+                    if(data==null){
+                        return ;
+                    }
+                    var url = "/jlw/teacherMergeSchoolClass/add.do?teacherMergeSchoolClassId="+data.teacherMergeSchoolClassId;
+                    Common.openDlg(url,"授课管理>"+data.teacherMergeSchoolClassId+">编辑");
+                },
+                del: function () {
+                    layui.use(['del'], function(){
+                        var delView = layui.del
+                        delView.delBatch();
+                    });
+                },
+                search: function () {
+                    Lib.doSearchForm($("#searchForm"), teacherMergeSchoolClassTable, 1);
+                    view.initToolBar()
+                },
+                refresh: function () {
+                    searchForm.reset();
+                    Lib.doSearchForm($("#searchForm"), teacherMergeSchoolClassTable, 1);
+                    view.initToolBar()
+                },
+            }
+            //触发事件
+            $('.ext-toolbar').on('click', function() {
+                var type = $(this).data('type');
+                toolbar[type] ? toolbar[type].call(this) : '';
+            });
+
+        }, initTableTool: table.on('tool(teacherMergeSchoolClassTable)', function (obj) {
+            var data = obj.data;
+            if (obj.event === 'edit') {
+                var url = "/jlw/teacherMergeSchoolClass/add.do?teacherMergeSchoolClassId="+data.teacherMergeSchoolClassId;
+                Common.openDlg(url,"授课管理>"+data.teacherMergeSchoolClassId+">编辑");
+            }else if(obj.event === "del"){
+                layer.confirm('是否确定删除该信息？', function (index) {
+                    var ret = Common.postAjax("/jlw/teacherMergeSchoolClass/delete.json",{ids:data.teacherMergeSchoolClassId});
+                    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/teacherMergeSchoolClass/teacherMergeSchoolClassApi.js

@@ -0,0 +1,18 @@
+/*访问后台的代码*/
+layui.define([], function(exports) {
+    var api={
+            updateTeacherMergeSchoolClass:function(form,callback){
+                Lib.submitForm("/jlw/teacherMergeSchoolClass/edit.json",form,{},callback)
+            },
+            addTeacherMergeSchoolClass:function(form,callback){
+                Lib.submitForm("/jlw/teacherMergeSchoolClass/add.json",form,{},callback)
+            },
+            del:function(ids,callback){
+                Common.post("/jlw/teacherMergeSchoolClass/delete.json",{"ids":ids},function(){
+                    callback();
+                })
+            }
+		
+    };
+    exports('teacherMergeSchoolClassApi',api);
+});

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

@@ -0,0 +1,48 @@
+<!--# layout("/common/layout.html",{"jsBase":"/js/jlw/teacherMergeSchoolClass/"}){ -->
+
+<form class="layui-form" id="addForm">
+    <div class="layui-row">
+        <div class="layui-form-item">
+            <div class="layui-inline">
+                <label class="layui-form-label">教师名称</label>
+                <div class="layui-input-inline">
+                    <layui:simpleDictSelect style='layui-input-inline' type="teacher.teacher_name.teacher_status=1"
+                                            id="teacherId" name="teacherId" value="${teacherMergeSchoolClass.teacherId}" layVerify="" />
+                </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">
+                    <layui:simpleDictSelect style='layui-input-inline' type="school_class.class_name.class_status=1"
+                                            id="schoolClassId" name="schoolClassId" value="${teacherMergeSchoolClass.schoolClassId}" layVerify="" />
+                </div>
+            </div>
+        </div>
+    </div>
+    <div class="layui-row">
+        <div class="layui-form-item">
+            <div class="layui-inline">
+                <!--            	<label class="layui-form-label">状态（1启用 2禁用）</label>-->
+                <label class="layui-form-label">状态</label>
+                <div class="layui-input-inline">
+                    <layui:simpleDictSelect style='layui-input-inline' type="global_open_status"
+                                            id="teacherMergeSchoolClassStatus" name="teacherMergeSchoolClassStatus" value="${teacherMergeSchoolClass.teacherMergeSchoolClassStatus}" layVerify="" />
+                </div>
+            </div>
+        </div>
+    </div>
+	<!-- 业务对象须有hidden字段，保存delFlag和version字段-->
+	<input type="hidden" name="teacherMergeSchoolClassId" value="${teacherMergeSchoolClass.teacherMergeSchoolClassId}" />
+    <layui:submitButtons id="addButton" buttonType="" showExamine="2" />
+</form>
+<!--#} -->
+<script>
+layui.use(['add'], function(){
+    var teacherMergeSchoolClassAdd = layui.add
+    teacherMergeSchoolClassAdd.init();
+});
+</script>

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

@@ -0,0 +1,48 @@
+<!--# layout("/common/layout.html",{"jsBase":"/js/jlw/teacherMergeSchoolClass/"}){ -->
+
+<form class="layui-form" id="updateForm">
+    <div class="layui-row">
+        <div class="layui-form-item">
+            <div class="layui-inline">
+                <label class="layui-form-label">教师名称</label>
+                <div class="layui-input-inline">
+                    <layui:simpleDictSelect style='layui-input-inline' type="teacher.teacher_name.teacher_status=1"
+                                            id="teacherId" name="teacherId" value="${teacherMergeSchoolClass.teacherId}" layVerify="" />
+                </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">
+                    <layui:simpleDictSelect style='layui-input-inline' type="school_class.class_name.class_status=1"
+                                            id="schoolClassId" name="schoolClassId" value="${teacherMergeSchoolClass.schoolClassId}" layVerify="" />
+                </div>
+            </div>
+        </div>
+    </div>
+    <div class="layui-row">
+        <div class="layui-form-item">
+            <div class="layui-inline">
+<!--            	<label class="layui-form-label">状态（1启用 2禁用）</label>-->
+            	<label class="layui-form-label">状态</label>
+				<div class="layui-input-inline">
+					<layui:simpleDictSelect style='layui-input-inline' type="global_open_status"
+						id="teacherMergeSchoolClassStatus" name="teacherMergeSchoolClassStatus" value="${teacherMergeSchoolClass.teacherMergeSchoolClassStatus}" layVerify="" />
+				</div>
+            </div>
+        </div>
+    </div>
+	<!-- 业务对象须有hidden字段，保存delFlag和version字段-->
+	<input type="hidden" name="teacherMergeSchoolClassId" value="${teacherMergeSchoolClass.teacherMergeSchoolClassId}" />
+    <layui:submitButtons id="updateButton"  buttonType="" showExamine="2" />
+</form>
+<!--#} -->
+<script>
+layui.use(['edit'], function(){
+    var teacherMergeSchoolClassEdit = layui.edit
+    teacherMergeSchoolClassEdit.init();
+});
+</script>

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

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