From 15c34f09da64adb75f02bc3bdcfdede531472f3b Mon Sep 17 00:00:00 2001 From: Mlxa0324 Date: Mon, 12 Sep 2022 23:22:02 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8E=92=E8=AF=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- data_base_design/天泽数据大平台.pdm | 16 +- .../dao/TeacherOpenCourseMergeTeacherDao.java | 25 ++ .../entity/TeacherOpenCourseMergeTeacher.java | 147 ++++++++++ .../TeacherOpenCourseScheduleSession.java | 2 + .../TeacherOpenCourseMergeTeacherService.java | 147 ++++++++++ ...acherOpenCourseMergeTeacherController.java | 206 ++++++++++++++ .../TeacherOpenCourseMergeTeacherQuery.java | 145 ++++++++++ ...TeacherOpenCourseScheduleSessionQuery.java | 5 +- .../sql/jlw/teacherOpenCourseMergeTeacher.md | 256 ++++++++++++++++++ .../static/js/jlw/studentClientLink/index.js | 2 +- .../static/js/jlw/teacherOpenCourse/index.js | 6 +- .../jlw/teacherOpenCourseMergeTeacher/add.js | 38 +++ .../jlw/teacherOpenCourseMergeTeacher/del.js | 23 ++ .../jlw/teacherOpenCourseMergeTeacher/edit.js | 28 ++ .../teacherOpenCourseMergeTeacher/index.js | 172 ++++++++++++ .../teacherOpenCourseMergeTeacherApi.js | 18 ++ .../teacherOpenCourseScheduleSession/index.js | 12 +- .../static/js/jlw/universityFaculty/index.js | 2 +- .../static/js/jlw/universitySystem/index.js | 16 +- .../templates/jlw/teacherOpenCourse/add.html | 17 +- .../templates/jlw/teacherOpenCourse/edit.html | 17 +- .../teacherOpenCourseMergeTeacher/add.html | 65 +++++ .../teacherOpenCourseMergeTeacher/edit.html | 65 +++++ .../teacherOpenCourseMergeTeacher/index.html | 29 ++ .../teacherOpenCourseScheduleSession/add.html | 29 +- .../edit.html | 125 ++++----- 26 files changed, 1490 insertions(+), 123 deletions(-) create mode 100644 web/src/main/java/com/ibeetl/jlw/dao/TeacherOpenCourseMergeTeacherDao.java create mode 100644 web/src/main/java/com/ibeetl/jlw/entity/TeacherOpenCourseMergeTeacher.java create mode 100644 web/src/main/java/com/ibeetl/jlw/service/TeacherOpenCourseMergeTeacherService.java create mode 100644 web/src/main/java/com/ibeetl/jlw/web/TeacherOpenCourseMergeTeacherController.java create mode 100644 web/src/main/java/com/ibeetl/jlw/web/query/TeacherOpenCourseMergeTeacherQuery.java create mode 100644 web/src/main/resources/sql/jlw/teacherOpenCourseMergeTeacher.md create mode 100644 web/src/main/resources/static/js/jlw/teacherOpenCourseMergeTeacher/add.js create mode 100644 web/src/main/resources/static/js/jlw/teacherOpenCourseMergeTeacher/del.js create mode 100644 web/src/main/resources/static/js/jlw/teacherOpenCourseMergeTeacher/edit.js create mode 100644 web/src/main/resources/static/js/jlw/teacherOpenCourseMergeTeacher/index.js create mode 100644 web/src/main/resources/static/js/jlw/teacherOpenCourseMergeTeacher/teacherOpenCourseMergeTeacherApi.js create mode 100644 web/src/main/resources/templates/jlw/teacherOpenCourseMergeTeacher/add.html create mode 100644 web/src/main/resources/templates/jlw/teacherOpenCourseMergeTeacher/edit.html create mode 100644 web/src/main/resources/templates/jlw/teacherOpenCourseMergeTeacher/index.html diff --git a/data_base_design/天泽数据大平台.pdm b/data_base_design/天泽数据大平台.pdm index 83ac49e7..9a19a095 100644 --- a/data_base_design/天泽数据大平台.pdm +++ b/data_base_design/天泽数据大平台.pdm @@ -1,5 +1,5 @@ - + @@ -4512,8 +4512,8 @@ Shadow=0 1661961019 1662810685 -((338453,27268), (339053,43395)) -((338719,43395),(338719,36777),(338753,36777),(338753,27268)) +((338453,26990), (339053,43395)) +((338719,43395),(338719,36777),(338753,36777),(338753,26990)) 1 8 16744576 @@ -4718,9 +4718,9 @@ Shadow=0 1662810688 -1662971428 -((296402,26938), (338650,29922)) -((338650,26938),(319044,26938),(319044,29622),(296402,29622)) +1662995498 +((296402,26648), (338650,29922)) +((338650,26648),(319044,26648),(319044,29622),(296402,29622)) 1 8 16744576 @@ -6516,9 +6516,9 @@ LABL 0 新宋体,8,N 1662809607 -1662971428 +1662995498 -1 -((329150,18730), (348150,35146)) +((329150,18150), (348150,35146)) 0 12615680 16570034 diff --git a/web/src/main/java/com/ibeetl/jlw/dao/TeacherOpenCourseMergeTeacherDao.java b/web/src/main/java/com/ibeetl/jlw/dao/TeacherOpenCourseMergeTeacherDao.java new file mode 100644 index 00000000..ddcf3707 --- /dev/null +++ b/web/src/main/java/com/ibeetl/jlw/dao/TeacherOpenCourseMergeTeacherDao.java @@ -0,0 +1,25 @@ +package com.ibeetl.jlw.dao; + +import com.ibeetl.jlw.entity.TeacherOpenCourseMergeTeacher; +import com.ibeetl.jlw.web.query.TeacherOpenCourseMergeTeacherQuery; +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.teacherOpenCourseMergeTeacher") +@Repository +public interface TeacherOpenCourseMergeTeacherDao extends BaseMapper{ + public PageQuery queryByCondition(PageQuery query); + public PageQuery queryByConditionQuery(PageQuery query); + public void deleteTeacherOpenCourseMergeTeacherByIds(String ids); + public int updateGivenByIds(TeacherOpenCourseMergeTeacherQuery teacherOpenCourseMergeTeacherQuery); + public List getByIds(String ids); + public List getValuesByQuery(TeacherOpenCourseMergeTeacherQuery teacherOpenCourseMergeTeacherQuery); +} diff --git a/web/src/main/java/com/ibeetl/jlw/entity/TeacherOpenCourseMergeTeacher.java b/web/src/main/java/com/ibeetl/jlw/entity/TeacherOpenCourseMergeTeacher.java new file mode 100644 index 00000000..38beb3a3 --- /dev/null +++ b/web/src/main/java/com/ibeetl/jlw/entity/TeacherOpenCourseMergeTeacher.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 TeacherOpenCourseMergeTeacher extends BaseEntity{ + + //课程开课教师关联ID + @NotNull(message = "ID不能为空", groups =ValidateConfig.UPDATE.class) + @SeqID(name = ORACLE_CORE_SEQ_NAME) + @AssignID(value = "maskAutoID",param = "com.ibeetl.jlw.entity.TeacherOpenCourseMergeTeacher") + + private Long teacherOpenCourseMergeTeacherId ; + + //课程开课ID + @Dict(type="teacher_open_course.teacher_open_course_title.teacher_open_course_status=1") + + private Long teacherOpenCourseId ; + + //教师ID + @Dict(type="teacher.teacher_name.teacher_status=1") + + private Long teacherId ; + + //状态（1启用 2禁用） + @Dict(type="global_open_status") + + private Integer teacherOpenCourseMergeTeacherStatus ; + + //创建时间 + + private Date teacherOpenCourseMergeTeacherAddTime ; + + //组织ID + + private Long orgId ; + + //用户ID + + private Long userId ; + + public TeacherOpenCourseMergeTeacher(){ + } + + /**课程开课教师关联ID + *@return + */ + public Long getTeacherOpenCourseMergeTeacherId(){ + return teacherOpenCourseMergeTeacherId; + } + /**课程开课教师关联ID + *@param teacherOpenCourseMergeTeacherId + */ + public void setTeacherOpenCourseMergeTeacherId(Long teacherOpenCourseMergeTeacherId){ + this.teacherOpenCourseMergeTeacherId = teacherOpenCourseMergeTeacherId; + } + + /**课程开课ID + *@return + */ + public Long getTeacherOpenCourseId(){ + return teacherOpenCourseId; + } + /**课程开课ID + *@param teacherOpenCourseId + */ + public void setTeacherOpenCourseId(Long teacherOpenCourseId){ + this.teacherOpenCourseId = teacherOpenCourseId; + } + + /**教师ID + *@return + */ + public Long getTeacherId(){ + return teacherId; + } + /**教师ID + *@param teacherId + */ + public void setTeacherId(Long teacherId){ + this.teacherId = teacherId; + } + + /**状态（1启用 2禁用） + *@return + */ + public Integer getTeacherOpenCourseMergeTeacherStatus(){ + return teacherOpenCourseMergeTeacherStatus; + } + /**状态（1启用 2禁用） + *@param teacherOpenCourseMergeTeacherStatus + */ + public void setTeacherOpenCourseMergeTeacherStatus(Integer teacherOpenCourseMergeTeacherStatus){ + this.teacherOpenCourseMergeTeacherStatus = teacherOpenCourseMergeTeacherStatus; + } + + /**创建时间 + *@return + */ + public Date getTeacherOpenCourseMergeTeacherAddTime(){ + return teacherOpenCourseMergeTeacherAddTime; + } + /**创建时间 + *@param teacherOpenCourseMergeTeacherAddTime + */ + public void setTeacherOpenCourseMergeTeacherAddTime(Date teacherOpenCourseMergeTeacherAddTime){ + this.teacherOpenCourseMergeTeacherAddTime = teacherOpenCourseMergeTeacherAddTime; + } + + /**组织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; + } + + +} diff --git a/web/src/main/java/com/ibeetl/jlw/entity/TeacherOpenCourseScheduleSession.java b/web/src/main/java/com/ibeetl/jlw/entity/TeacherOpenCourseScheduleSession.java index d1cda9c6..23722343 100644 --- a/web/src/main/java/com/ibeetl/jlw/entity/TeacherOpenCourseScheduleSession.java +++ b/web/src/main/java/com/ibeetl/jlw/entity/TeacherOpenCourseScheduleSession.java @@ -36,10 +36,12 @@ public class TeacherOpenCourseScheduleSession extends BaseEntity{ private Integer teacherOpenCourseScheduleSessionStatus ; //课程开课ID + @Dict(type="teacher_open_course.teacher_open_course_title.teacher_open_course_status=1") private Long teacherOpenCourseId ; //教师ID + @Dict(type="teacher.teacher_name.teacher_status=1") private Long teacherId ; diff --git a/web/src/main/java/com/ibeetl/jlw/service/TeacherOpenCourseMergeTeacherService.java b/web/src/main/java/com/ibeetl/jlw/service/TeacherOpenCourseMergeTeacherService.java new file mode 100644 index 00000000..7d66473e --- /dev/null +++ b/web/src/main/java/com/ibeetl/jlw/service/TeacherOpenCourseMergeTeacherService.java @@ -0,0 +1,147 @@ +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.TeacherOpenCourseMergeTeacherDao; +import com.ibeetl.jlw.entity.TeacherOpenCourseMergeTeacher; +import com.ibeetl.jlw.web.query.TeacherOpenCourseMergeTeacherQuery; +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.List; + + +/** + * 课程开课关联教师 Service + * 当分布式ID开启后请勿使用insert(*,true) + */ + +@Service +@Transactional +public class TeacherOpenCourseMergeTeacherService extends CoreBaseService{ + + @Autowired private TeacherOpenCourseMergeTeacherDao teacherOpenCourseMergeTeacherDao; + + public PageQueryqueryByCondition(PageQuery query){ + PageQuery ret = teacherOpenCourseMergeTeacherDao.queryByCondition(query); + queryListAfter(ret.getList()); + return ret; + } + + public PageQueryqueryByConditionQuery(PageQuery query){ + PageQuery ret = teacherOpenCourseMergeTeacherDao.queryByConditionQuery(query); + queryListAfter(ret.getList()); + return ret; + } + + public void deleteByList(List list){ + String ids = ""; + ToolUtils.deleteNullList(list); + for(int i=0;null != list && i teacherOpenCourseMergeTeacherList = new ArrayList<>(); + try { + teacherOpenCourseMergeTeacherList = JSON.parseArray(teacherOpenCourseMergeTeacherQuery.getTeacherOpenCourseMergeTeacherJsonStr(), TeacherOpenCourseMergeTeacher.class); + } catch (Exception e) { + try { + teacherOpenCourseMergeTeacherList.add(JSONObject.parseObject(teacherOpenCourseMergeTeacherQuery.getTeacherOpenCourseMergeTeacherJsonStr(), TeacherOpenCourseMergeTeacher.class)); + } catch (Exception e1) {} + } + ToolUtils.deleteNullList(teacherOpenCourseMergeTeacherList); + if(null != teacherOpenCourseMergeTeacherList && teacherOpenCourseMergeTeacherList.size()>0){ + for(int i=0;i 0; + if(!flag){ + msg = "更新指定参数失败"; + } + }else{ + msg = "指定参数为空"; + } + return msg; + } + + public List getValues (Object paras){ + return sqlManager.select("jlw.teacherOpenCourseMergeTeacher.getTeacherOpenCourseMergeTeacherValues",TeacherOpenCourseMergeTeacher.class,paras); + } + + public List getValuesByQuery (TeacherOpenCourseMergeTeacherQuery teacherOpenCourseMergeTeacherQuery){ + return teacherOpenCourseMergeTeacherDao.getValuesByQuery(teacherOpenCourseMergeTeacherQuery); + } + + public TeacherOpenCourseMergeTeacher getInfo (Long teacherOpenCourseMergeTeacherId){ + TeacherOpenCourseMergeTeacherQuery teacherOpenCourseMergeTeacherQuery = new TeacherOpenCourseMergeTeacherQuery(); + teacherOpenCourseMergeTeacherQuery.setTeacherOpenCourseMergeTeacherId(teacherOpenCourseMergeTeacherId); + List list = teacherOpenCourseMergeTeacherDao.getValuesByQuery(teacherOpenCourseMergeTeacherQuery); + if(null != list && list.size()>0){ + return list.get(0); + }else{ + return null; + } + } + + public TeacherOpenCourseMergeTeacher getInfo (TeacherOpenCourseMergeTeacherQuery teacherOpenCourseMergeTeacherQuery){ + List list = teacherOpenCourseMergeTeacherDao.getValuesByQuery(teacherOpenCourseMergeTeacherQuery); + if(null != list && list.size()>0){ + return list.get(0); + }else{ + return null; + } + } + +} diff --git a/web/src/main/java/com/ibeetl/jlw/web/TeacherOpenCourseMergeTeacherController.java b/web/src/main/java/com/ibeetl/jlw/web/TeacherOpenCourseMergeTeacherController.java new file mode 100644 index 00000000..835b01b0 --- /dev/null +++ b/web/src/main/java/com/ibeetl/jlw/web/TeacherOpenCourseMergeTeacherController.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.TeacherOpenCourseMergeTeacher; +import com.ibeetl.jlw.service.TeacherOpenCourseMergeTeacherService; +import com.ibeetl.jlw.web.query.TeacherOpenCourseMergeTeacherQuery; +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 TeacherOpenCourseMergeTeacherController{ + + private final Log log = LogFactory.getLog(this.getClass()); + private static final String MODEL = "/jlw/teacherOpenCourseMergeTeacher"; + private static final String API = "/api/teacherOpenCourseMergeTeacher"; + + + @Autowired private TeacherOpenCourseMergeTeacherService teacherOpenCourseMergeTeacherService; + + @Autowired + FileService fileService; + + /* 前端接口 */ + + @PostMapping(API + "/getPageList.do") + @ResponseBody + public JsonResult getPageList(TeacherOpenCourseMergeTeacherQuery condition,@SCoreUser CoreUser coreUser){ + if(null == coreUser){ + return JsonResult.failMessage("请登录后再操作"); + }else{ + PageQuery page = condition.getPageQuery(); + teacherOpenCourseMergeTeacherService.queryByConditionQuery(page); + return JsonResult.success(page); + } + } + + + @GetMapping(API + "/getInfo.do") + @ResponseBody + public JsonResultgetInfo(TeacherOpenCourseMergeTeacherQuery param,@SCoreUser CoreUser coreUser) { + if(null == coreUser){ + return JsonResult.failMessage("请登录后再操作"); + }else{ + TeacherOpenCourseMergeTeacher teacherOpenCourseMergeTeacher = teacherOpenCourseMergeTeacherService.getInfo(param); + return JsonResult.success(teacherOpenCourseMergeTeacher); + } + } + + + @GetMapping(API + "/getList.do") + @ResponseBody + public JsonResult>getList(TeacherOpenCourseMergeTeacherQuery param,@SCoreUser CoreUser coreUser) { + if(null == coreUser){ + return JsonResult.failMessage("请登录后再操作"); + }else{ + Listlist = teacherOpenCourseMergeTeacherService.getValuesByQuery(param); + return JsonResult.success(list); + } + } + + + /* 后台页面 */ + + @GetMapping(MODEL + "/index.do") + @Function("teacherOpenCourseMergeTeacher.query") + @ResponseBody + public ModelAndView index() { + ModelAndView view = new ModelAndView("/jlw/teacherOpenCourseMergeTeacher/index.html") ; + view.addObject("search", TeacherOpenCourseMergeTeacherQuery.class.getName()); + return view; + } + + @GetMapping(MODEL + "/edit.do") + @Function("teacherOpenCourseMergeTeacher.edit") + @ResponseBody + public ModelAndView edit(Long teacherOpenCourseMergeTeacherId) { + ModelAndView view = new ModelAndView("/jlw/teacherOpenCourseMergeTeacher/edit.html"); + TeacherOpenCourseMergeTeacher teacherOpenCourseMergeTeacher = teacherOpenCourseMergeTeacherService.queryById(teacherOpenCourseMergeTeacherId); + view.addObject("teacherOpenCourseMergeTeacher", teacherOpenCourseMergeTeacher); + return view; + } + + @GetMapping(MODEL + "/add.do") + @Function("teacherOpenCourseMergeTeacher.add") + @ResponseBody + public ModelAndView add(Long teacherOpenCourseMergeTeacherId) { + ModelAndView view = new ModelAndView("/jlw/teacherOpenCourseMergeTeacher/add.html"); + if(null != teacherOpenCourseMergeTeacherId){ + TeacherOpenCourseMergeTeacher teacherOpenCourseMergeTeacher = teacherOpenCourseMergeTeacherService.queryById(teacherOpenCourseMergeTeacherId); + view.addObject("teacherOpenCourseMergeTeacher", teacherOpenCourseMergeTeacher); + }else { + view.addObject("teacherOpenCourseMergeTeacher", new TeacherOpenCourseMergeTeacher()); + } + return view; + } + + /* 后台接口 */ + + @PostMapping(MODEL + "/list.json") + @Function("teacherOpenCourseMergeTeacher.query") + @ResponseBody + public JsonResult list(TeacherOpenCourseMergeTeacherQuery condition){ + PageQuery page = condition.getPageQuery(); + teacherOpenCourseMergeTeacherService.queryByCondition(page); + return JsonResult.success(page); + } + + @PostMapping(MODEL + "/addAll.json") + @Function("teacherOpenCourseMergeTeacher.add") + @ResponseBody + public JsonResult addAll(TeacherOpenCourseMergeTeacherQuery teacherOpenCourseMergeTeacherQuery,@SCoreUser CoreUser coreUser){ + if(null == coreUser){ + return JsonResult.failMessage("请登录后再操作"); + }else{ + teacherOpenCourseMergeTeacherQuery.setUserId(coreUser.getId()); + teacherOpenCourseMergeTeacherQuery.setOrgId(coreUser.getOrgId()); + String msg = teacherOpenCourseMergeTeacherService.addAll(teacherOpenCourseMergeTeacherQuery); + if (StringUtils.isBlank(msg)) { + return JsonResult.success(); + } else { + return JsonResult.failMessage("新增失败,"+msg); + } + } + } + + @PostMapping(MODEL + "/add.json") + @Function("teacherOpenCourseMergeTeacher.add") + @ResponseBody + public JsonResult add(@Validated(ValidateConfig.ADD.class) TeacherOpenCourseMergeTeacherQuery teacherOpenCourseMergeTeacherQuery, BindingResult result,@SCoreUser CoreUser coreUser){ + if(result.hasErrors()){ + return JsonResult.failMessage(result); + }else{ + teacherOpenCourseMergeTeacherQuery.setUserId(coreUser.getId()); + teacherOpenCourseMergeTeacherQuery.setOrgId(coreUser.getOrgId()); + return teacherOpenCourseMergeTeacherService.add(teacherOpenCourseMergeTeacherQuery); + } + } + + @PostMapping(MODEL + "/edit.json") + @Function("teacherOpenCourseMergeTeacher.edit") + @ResponseBody + public JsonResult update(@Validated(ValidateConfig.UPDATE.class) TeacherOpenCourseMergeTeacherQuery teacherOpenCourseMergeTeacherQuery, BindingResult result) { + if(result.hasErrors()){ + return JsonResult.failMessage(result); + }else { + teacherOpenCourseMergeTeacherQuery.setUserId(null); + teacherOpenCourseMergeTeacherQuery.setOrgId(null); + String msg = teacherOpenCourseMergeTeacherService.edit(teacherOpenCourseMergeTeacherQuery); + if (StringUtils.isBlank(msg)) { + return JsonResult.success(); + } else { + return JsonResult.failMessage("更新失败,"+msg); + } + } + } + + + @GetMapping(MODEL + "/view.json") + @Function("teacherOpenCourseMergeTeacher.query") + @ResponseBody + public JsonResultqueryInfo(Long teacherOpenCourseMergeTeacherId) { + TeacherOpenCourseMergeTeacher teacherOpenCourseMergeTeacher = teacherOpenCourseMergeTeacherService.queryById( teacherOpenCourseMergeTeacherId); + return JsonResult.success(teacherOpenCourseMergeTeacher); + } + + @GetMapping(MODEL + "/getValues.json") + @Function("teacherOpenCourseMergeTeacher.query") + @ResponseBody + public JsonResult>getValues(TeacherOpenCourseMergeTeacherQuery param) { + Listlist = teacherOpenCourseMergeTeacherService.getValuesByQuery(param); + return JsonResult.success(list); + } + + + @PostMapping(MODEL + "/delete.json") + @Function("teacherOpenCourseMergeTeacher.delete") + @ResponseBody + public JsonResult delete(String ids) { + teacherOpenCourseMergeTeacherService.deleteTeacherOpenCourseMergeTeacher(ids); + return JsonResult.success(); + } + + +} diff --git a/web/src/main/java/com/ibeetl/jlw/web/query/TeacherOpenCourseMergeTeacherQuery.java b/web/src/main/java/com/ibeetl/jlw/web/query/TeacherOpenCourseMergeTeacherQuery.java new file mode 100644 index 00000000..77b96ebd --- /dev/null +++ b/web/src/main/java/com/ibeetl/jlw/web/query/TeacherOpenCourseMergeTeacherQuery.java @@ -0,0 +1,145 @@ +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.TeacherOpenCourseMergeTeacher; + +import javax.validation.constraints.NotNull; +import java.util.Date; + +/** + *课程开课关联教师查询 + */ +public class TeacherOpenCourseMergeTeacherQuery extends PageParam { + @NotNull(message = "ID不能为空", groups =ValidateConfig.UPDATE.class) + @Query(name = "课程开课教师关联ID", display = false) + private Long teacherOpenCourseMergeTeacherId; + @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 = true,type=Query.TYPE_DICT,dict="teacher.teacher_name.teacher_status=1") + private Long teacherId; + @Query(name = "状态（1启用 2禁用）", display = true,type=Query.TYPE_DICT,dict="global_open_status") + private Integer teacherOpenCourseMergeTeacherStatus; + @Query(name = "创建时间", display = false) + private Date teacherOpenCourseMergeTeacherAddTime; + @Query(name = "组织ID", display = false) + private Long orgId; + @Query(name = "用户ID", display = false) + private Long userId; + + private String teacherOpenCourseMergeTeacherIdPlural; + private String teacherOpenCourseIdPlural; + private String teacherIdPlural; + private String teacherOpenCourseMergeTeacherStatusPlural; + private String orgIdPlural; + private String userIdPlural; + + private String teacherOpenCourseMergeTeacherJsonStr;//json格式 + + private String _given;//指定更新的特定字段，多个逗号隔开 + + public Long getTeacherOpenCourseMergeTeacherId(){ + return teacherOpenCourseMergeTeacherId; + } + public void setTeacherOpenCourseMergeTeacherId(Long teacherOpenCourseMergeTeacherId ){ + this.teacherOpenCourseMergeTeacherId = teacherOpenCourseMergeTeacherId; + } + public Long getTeacherOpenCourseId(){ + return teacherOpenCourseId; + } + public void setTeacherOpenCourseId(Long teacherOpenCourseId ){ + this.teacherOpenCourseId = teacherOpenCourseId; + } + public Long getTeacherId(){ + return teacherId; + } + public void setTeacherId(Long teacherId ){ + this.teacherId = teacherId; + } + public Integer getTeacherOpenCourseMergeTeacherStatus(){ + return teacherOpenCourseMergeTeacherStatus; + } + public void setTeacherOpenCourseMergeTeacherStatus(Integer teacherOpenCourseMergeTeacherStatus ){ + this.teacherOpenCourseMergeTeacherStatus = teacherOpenCourseMergeTeacherStatus; + } + public Date getTeacherOpenCourseMergeTeacherAddTime(){ + return teacherOpenCourseMergeTeacherAddTime; + } + public void setTeacherOpenCourseMergeTeacherAddTime(Date teacherOpenCourseMergeTeacherAddTime ){ + this.teacherOpenCourseMergeTeacherAddTime = teacherOpenCourseMergeTeacherAddTime; + } + 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 TeacherOpenCourseMergeTeacher pojo(){ + TeacherOpenCourseMergeTeacher pojo = new TeacherOpenCourseMergeTeacher(); + pojo.setTeacherOpenCourseMergeTeacherId(this.getTeacherOpenCourseMergeTeacherId()); + pojo.setTeacherOpenCourseId(this.getTeacherOpenCourseId()); + pojo.setTeacherId(this.getTeacherId()); + pojo.setTeacherOpenCourseMergeTeacherStatus(this.getTeacherOpenCourseMergeTeacherStatus()); + pojo.setTeacherOpenCourseMergeTeacherAddTime(this.getTeacherOpenCourseMergeTeacherAddTime()); + pojo.setOrgId(this.getOrgId()); + pojo.setUserId(this.getUserId()); + return pojo; + } + + public String getTeacherOpenCourseMergeTeacherIdPlural(){ + return teacherOpenCourseMergeTeacherIdPlural; + } + public void setTeacherOpenCourseMergeTeacherIdPlural(String teacherOpenCourseMergeTeacherIdPlural){ + this.teacherOpenCourseMergeTeacherIdPlural = teacherOpenCourseMergeTeacherIdPlural; + } + public String getTeacherOpenCourseIdPlural(){ + return teacherOpenCourseIdPlural; + } + public void setTeacherOpenCourseIdPlural(String teacherOpenCourseIdPlural){ + this.teacherOpenCourseIdPlural = teacherOpenCourseIdPlural; + } + public String getTeacherIdPlural(){ + return teacherIdPlural; + } + public void setTeacherIdPlural(String teacherIdPlural){ + this.teacherIdPlural = teacherIdPlural; + } + public String getTeacherOpenCourseMergeTeacherStatusPlural(){ + return teacherOpenCourseMergeTeacherStatusPlural; + } + public void setTeacherOpenCourseMergeTeacherStatusPlural(String teacherOpenCourseMergeTeacherStatusPlural){ + this.teacherOpenCourseMergeTeacherStatusPlural = teacherOpenCourseMergeTeacherStatusPlural; + } + 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 getTeacherOpenCourseMergeTeacherJsonStr(){ + return teacherOpenCourseMergeTeacherJsonStr; + } + public void setTeacherOpenCourseMergeTeacherJsonStr(String teacherOpenCourseMergeTeacherJsonStr ){ + this.teacherOpenCourseMergeTeacherJsonStr = teacherOpenCourseMergeTeacherJsonStr; + } + public String get_given() { + return _given; + } + public void set_given(String _given) { + this._given = _given; + } +} diff --git a/web/src/main/java/com/ibeetl/jlw/web/query/TeacherOpenCourseScheduleSessionQuery.java b/web/src/main/java/com/ibeetl/jlw/web/query/TeacherOpenCourseScheduleSessionQuery.java index 0aeeec8b..c8095827 100644 --- a/web/src/main/java/com/ibeetl/jlw/web/query/TeacherOpenCourseScheduleSessionQuery.java +++ b/web/src/main/java/com/ibeetl/jlw/web/query/TeacherOpenCourseScheduleSessionQuery.java @@ -21,9 +21,10 @@ public class TeacherOpenCourseScheduleSessionQuery extends PageParam { @Query(name = "状态", display = true,type=Query.TYPE_DICT,dict="global_status") // @Query(name = "状态（1正常 2删除）", display = true,type=Query.TYPE_DICT,dict="global_status") private Integer teacherOpenCourseScheduleSessionStatus; - @Query(name = "课程开课ID", display = true) + + @Query(name = "开课名称", 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 = true) + @Query(name = "教师名称", display = true,type=Query.TYPE_DICT,dict="teacher.teacher_name.teacher_status=1") private Long teacherId; @Query(name = "班级ID集合", display = true) private String schoolClassIds; diff --git a/web/src/main/resources/sql/jlw/teacherOpenCourseMergeTeacher.md b/web/src/main/resources/sql/jlw/teacherOpenCourseMergeTeacher.md new file mode 100644 index 00000000..4eb66eea --- /dev/null +++ b/web/src/main/resources/sql/jlw/teacherOpenCourseMergeTeacher.md @@ -0,0 +1,256 @@ +queryByCondition +=== +* 根据不为空的参数进行分页查询 + + select + @pageTag(){ + t.* + @} + from teacher_open_course_merge_teacher t + where 1=1 + @//数据权限，该sql语句功能点,如果不考虑数据权限，可以删除此行 + and #function("teacherOpenCourseMergeTeacher.query")# + @if(!isEmpty(teacherOpenCourseMergeTeacherId)){ + and t.teacher_open_course_merge_teacher_id =#teacherOpenCourseMergeTeacherId# + @} + @if(!isEmpty(teacherOpenCourseMergeTeacherIdPlural)){ + and find_in_set(t.teacher_open_course_merge_teacher_id,#teacherOpenCourseMergeTeacherIdPlural#) + @} + @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(teacherId)){ + and t.teacher_id =#teacherId# + @} + @if(!isEmpty(teacherIdPlural)){ + and find_in_set(t.teacher_id,#teacherIdPlural#) + @} + @if(!isEmpty(teacherOpenCourseMergeTeacherStatus)){ + and t.teacher_open_course_merge_teacher_status =#teacherOpenCourseMergeTeacherStatus# + @} + @if(!isEmpty(teacherOpenCourseMergeTeacherStatusPlural)){ + and find_in_set(t.teacher_open_course_merge_teacher_status,#teacherOpenCourseMergeTeacherStatusPlural#) + @} + @if(!isEmpty(teacherOpenCourseMergeTeacherAddTime)){ + and t.teacher_open_course_merge_teacher_add_time =#teacherOpenCourseMergeTeacherAddTime# + @} + @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_teacher t + where 1=1 + @if(!isEmpty(teacherOpenCourseMergeTeacherId)){ + and t.teacher_open_course_merge_teacher_id =#teacherOpenCourseMergeTeacherId# + @} + @if(!isEmpty(teacherOpenCourseMergeTeacherIdPlural)){ + and find_in_set(t.teacher_open_course_merge_teacher_id,#teacherOpenCourseMergeTeacherIdPlural#) + @} + @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(teacherId)){ + and t.teacher_id =#teacherId# + @} + @if(!isEmpty(teacherIdPlural)){ + and find_in_set(t.teacher_id,#teacherIdPlural#) + @} + @if(!isEmpty(teacherOpenCourseMergeTeacherStatus)){ + and t.teacher_open_course_merge_teacher_status =#teacherOpenCourseMergeTeacherStatus# + @} + @if(!isEmpty(teacherOpenCourseMergeTeacherStatusPlural)){ + and find_in_set(t.teacher_open_course_merge_teacher_status,#teacherOpenCourseMergeTeacherStatusPlural#) + @} + @if(!isEmpty(teacherOpenCourseMergeTeacherAddTime)){ + and t.teacher_open_course_merge_teacher_add_time =#teacherOpenCourseMergeTeacherAddTime# + @} + @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#) + @} + + + + +deleteTeacherOpenCourseMergeTeacherByIds +=== + +* 批量删除 + + delete from teacher_open_course_merge_teacher where find_in_set(teacher_open_course_merge_teacher_id,#ids#) + + + +getByIds +=== + + select * from teacher_open_course_merge_teacher where find_in_set(teacher_open_course_merge_teacher_id,#ids#) + + +updateGivenByIds +=== + +* 批量更新指定字段，无论此字段是否有值 + + update teacher_open_course_merge_teacher + set + @if(contain("teacherOpenCourseId",_given)){ + @if(isEmpty(teacherOpenCourseId)){ + teacher_open_course_id = null , + @}else{ + teacher_open_course_id = #teacherOpenCourseId# , + @} + @} + @if(contain("teacherId",_given)){ + @if(isEmpty(teacherId)){ + teacher_id = null , + @}else{ + teacher_id = #teacherId# , + @} + @} + @if(contain("teacherOpenCourseMergeTeacherStatus",_given)){ + @if(isEmpty(teacherOpenCourseMergeTeacherStatus)){ + teacher_open_course_merge_teacher_status = null , + @}else{ + teacher_open_course_merge_teacher_status = #teacherOpenCourseMergeTeacherStatus# , + @} + @} + @if(contain("teacherOpenCourseMergeTeacherAddTime",_given)){ + @if(isEmpty(teacherOpenCourseMergeTeacherAddTime)){ + teacher_open_course_merge_teacher_add_time = null , + @}else{ + teacher_open_course_merge_teacher_add_time = #teacherOpenCourseMergeTeacherAddTime# , + @} + @} + @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_teacher_id = teacher_open_course_merge_teacher_id + where find_in_set(teacher_open_course_merge_teacher_id,#teacherOpenCourseMergeTeacherIdPlural#) + + + +getTeacherOpenCourseMergeTeacherValues +=== + +* 根据不为空的参数进行查询 + + select t.* + from teacher_open_course_merge_teacher t + where 1=1 + @if(!isEmpty(teacherOpenCourseMergeTeacherId)){ + and t.teacher_open_course_merge_teacher_id =#teacherOpenCourseMergeTeacherId# + @} + @if(!isEmpty(teacherOpenCourseId)){ + and t.teacher_open_course_id =#teacherOpenCourseId# + @} + @if(!isEmpty(teacherId)){ + and t.teacher_id =#teacherId# + @} + @if(!isEmpty(teacherOpenCourseMergeTeacherStatus)){ + and t.teacher_open_course_merge_teacher_status =#teacherOpenCourseMergeTeacherStatus# + @} + @if(!isEmpty(teacherOpenCourseMergeTeacherAddTime)){ + and t.teacher_open_course_merge_teacher_add_time =#teacherOpenCourseMergeTeacherAddTime# + @} + @if(!isEmpty(orgId)){ + and t.org_id =#orgId# + @} + @if(!isEmpty(userId)){ + and t.user_id =#userId# + @} + + +getValuesByQuery +=== + +* 根据不为空的参数进行查询 + + select t.* + from teacher_open_course_merge_teacher t + where 1=1 and #function("teacherOpenCourseMergeTeacher.query")# + @if(!isEmpty(teacherOpenCourseMergeTeacherId)){ + and t.teacher_open_course_merge_teacher_id =#teacherOpenCourseMergeTeacherId# + @} + @if(!isEmpty(teacherOpenCourseMergeTeacherIdPlural)){ + and find_in_set(t.teacher_open_course_merge_teacher_id,#teacherOpenCourseMergeTeacherIdPlural#) + @} + @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(teacherId)){ + and t.teacher_id =#teacherId# + @} + @if(!isEmpty(teacherIdPlural)){ + and find_in_set(t.teacher_id,#teacherIdPlural#) + @} + @if(!isEmpty(teacherOpenCourseMergeTeacherStatus)){ + and t.teacher_open_course_merge_teacher_status =#teacherOpenCourseMergeTeacherStatus# + @} + @if(!isEmpty(teacherOpenCourseMergeTeacherStatusPlural)){ + and find_in_set(t.teacher_open_course_merge_teacher_status,#teacherOpenCourseMergeTeacherStatusPlural#) + @} + @if(!isEmpty(teacherOpenCourseMergeTeacherAddTime)){ + and t.teacher_open_course_merge_teacher_add_time =#teacherOpenCourseMergeTeacherAddTime# + @} + @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#) + @} + + + diff --git a/web/src/main/resources/static/js/jlw/studentClientLink/index.js b/web/src/main/resources/static/js/jlw/studentClientLink/index.js index 538837c7..7ae38be9 100644 --- a/web/src/main/resources/static/js/jlw/studentClientLink/index.js +++ b/web/src/main/resources/static/js/jlw/studentClientLink/index.js @@ -109,7 +109,7 @@ layui.define([ 'form', 'laydate', 'table' ], function(exports) { // hideField :false, // hide:$.isEmpty(sx_['orgId'])?false:sx_['orgId'], // } - ,{ + { field : 'operation_',title : '操作',align:"center", templet: function (d) { var htm = ''; htm += ''; diff --git a/web/src/main/resources/static/js/jlw/teacherOpenCourse/index.js b/web/src/main/resources/static/js/jlw/teacherOpenCourse/index.js index 189d7bd2..fa77e01a 100644 --- a/web/src/main/resources/static/js/jlw/teacherOpenCourse/index.js +++ b/web/src/main/resources/static/js/jlw/teacherOpenCourse/index.js @@ -56,11 +56,11 @@ layui.define([ 'form', 'laydate', 'table' ], function(exports) { hide:$.isEmpty(sx_['teacherOpenCourseCode'])?false:sx_['teacherOpenCourseCode'], }, { - field : 'teacherId', - title : '教师ID', + field : 'teacherIdText', + title : '教师名称', align:"center", hideField :false, - hide:$.isEmpty(sx_['teacherId'])?false:sx_['teacherId'], + hide:$.isEmpty(sx_['teacherIdText'])?false:sx_['teacherIdText'], }, { field : 'teacherOpenCourseCover', diff --git a/web/src/main/resources/static/js/jlw/teacherOpenCourseMergeTeacher/add.js b/web/src/main/resources/static/js/jlw/teacherOpenCourseMergeTeacher/add.js new file mode 100644 index 00000000..e3909257 --- /dev/null +++ b/web/src/main/resources/static/js/jlw/teacherOpenCourseMergeTeacher/add.js @@ -0,0 +1,38 @@ +layui.define([ 'form', 'laydate', 'table','teacherOpenCourseMergeTeacherApi'], function(exports) { + var form = layui.form; + var teacherOpenCourseMergeTeacherApi = layui.teacherOpenCourseMergeTeacherApi; + 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 teacherOpenCourseMergeTeacherId = $("#addForm input[name='teacherOpenCourseMergeTeacherId']").val(); + if(!$.isEmpty(teacherOpenCourseMergeTeacherId)){ + teacherOpenCourseMergeTeacherApi.updateTeacherOpenCourseMergeTeacher($('#addForm'),function(){ + parent.window.dataReload(); + Common.info("更新成功"); + Lib.closeFrame(); + }); + }else{ + teacherOpenCourseMergeTeacherApi.addTeacherOpenCourseMergeTeacher($('#addForm'),function(){ + parent.window.dataReload(); + Common.info("添加成功"); + Lib.closeFrame(); + }); + } + + }); + }); + + $("#addButton-cancel").click(function(){ + Lib.closeFrame(); + }); + } + + } + exports('add',view); +}); diff --git a/web/src/main/resources/static/js/jlw/teacherOpenCourseMergeTeacher/del.js b/web/src/main/resources/static/js/jlw/teacherOpenCourseMergeTeacher/del.js new file mode 100644 index 00000000..31fdb131 --- /dev/null +++ b/web/src/main/resources/static/js/jlw/teacherOpenCourseMergeTeacher/del.js @@ -0,0 +1,23 @@ +layui.define(['table', 'teacherOpenCourseMergeTeacherApi'], function(exports) { + var teacherOpenCourseMergeTeacherApi = layui.teacherOpenCourseMergeTeacherApi; + var table=layui.table; + var view = { + init:function(){ + }, + delBatch:function(){ + var data = Common.getMoreDataFromTable(table,"teacherOpenCourseMergeTeacherTable"); + if(data==null){ + return ; + } + Common.openConfirm("确认要删除这些课程开课关联教师?",function(){ + var ids =Common.concatBatchId(data,"teacherOpenCourseMergeTeacherId"); + teacherOpenCourseMergeTeacherApi.del(ids,function(){ + Common.info("删除成功"); + dataReload(); + }) + }) + } + } + exports('del',view); + +}); \ No newline at end of file diff --git a/web/src/main/resources/static/js/jlw/teacherOpenCourseMergeTeacher/edit.js b/web/src/main/resources/static/js/jlw/teacherOpenCourseMergeTeacher/edit.js new file mode 100644 index 00000000..fca058af --- /dev/null +++ b/web/src/main/resources/static/js/jlw/teacherOpenCourseMergeTeacher/edit.js @@ -0,0 +1,28 @@ +layui.define([ 'form', 'laydate', 'table','teacherOpenCourseMergeTeacherApi'], function(exports) { + var form = layui.form; + var teacherOpenCourseMergeTeacherApi = layui.teacherOpenCourseMergeTeacherApi; + var index = layui.index; + var view = { + init:function(){ + Lib.initGenrealForm($("#updateForm"),form); + this.initSubmit(); + }, + initSubmit:function(){ + $("#updateButton").click(function(){ + form.on('submit(form)', function(){ + teacherOpenCourseMergeTeacherApi.updateTeacherOpenCourseMergeTeacher($('#updateForm'),function(){ + parent.window.dataReload(); + Common.info("更新成功"); + Lib.closeFrame(); + }); + }); + }); + $("#updateButton-cancel").click(function(){ + Lib.closeFrame(); + }); + } + + } + exports('edit',view); + +}); \ No newline at end of file diff --git a/web/src/main/resources/static/js/jlw/teacherOpenCourseMergeTeacher/index.js b/web/src/main/resources/static/js/jlw/teacherOpenCourseMergeTeacher/index.js new file mode 100644 index 00000000..f8d9748b --- /dev/null +++ b/web/src/main/resources/static/js/jlw/teacherOpenCourseMergeTeacher/index.js @@ -0,0 +1,172 @@ +layui.define([ 'form', 'laydate', 'table' ], function(exports) { + var form = layui.form; + var laydate = layui.laydate; + var table = layui.table; + var teacherOpenCourseMergeTeacherTable = null; + var view ={ + init:function(){ + var that = this + this.initTable(); + this.initSearchForm(); + this.initToolBar(); + window.dataReload = function(){ + Lib.doSearchForm($("#searchForm"),teacherOpenCourseMergeTeacherTable) + that.initToolBar(); + } + }, + initTable:function(){ + var sx_ = localStorage.getItem("teacherOpenCourseMergeTeacherTable_field_"+Common.userInfoId); //筛选值显示、隐藏缓存 + if($.isEmpty(sx_)){sx_ = {};}else {sx_ = JSON.parse(sx_);} + teacherOpenCourseMergeTeacherTable = table.render({ + elem : '#teacherOpenCourseMergeTeacherTable', + height : Lib.getTableHeight(1), + cellMinWidth: 100, + method : 'post', + url : Common.ctxPath + '/jlw/teacherOpenCourseMergeTeacher/list.json' // 数据接口 + ,page : Lib.tablePage // 开启分页 + ,toolbar: '#toolbar_teacherOpenCourseMergeTeacher' //自定义头部左侧工具栏 + ,defaultToolbar: ['filter', 'print', 'exports'] //头部右侧工具栏 + ,limit : 10, + cols : [ [ // 表头 + { + type : 'checkbox', + + }, + { + field : 'teacherOpenCourseMergeTeacherId', + title : '课程开课教师关联ID', + align:"center", + hideField :false, + hide:$.isEmpty(sx_['teacherOpenCourseMergeTeacherId'])?false:sx_['teacherOpenCourseMergeTeacherId'], + + 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 : 'teacherIdText', //数据字典类型为 teacher.teacher_name.teacher_status=1 + title : '教师ID', + align:"center", + hideField :false, + hide:$.isEmpty(sx_['teacherIdText'])?false:sx_['teacherIdText'], + }, + { + field : 'teacherOpenCourseMergeTeacherStatusText', //数据字典类型为 global_open_status + title : '状态（1启用 2禁用）', + align:"center", + hideField :false, + hide:$.isEmpty(sx_['teacherOpenCourseMergeTeacherStatusText'])?false:sx_['teacherOpenCourseMergeTeacherStatusText'], + }, + { + field : 'teacherOpenCourseMergeTeacherAddTime', + title : '创建时间', + align:"center", + hideField :false, + hide:$.isEmpty(sx_['teacherOpenCourseMergeTeacherAddTime'])?false:sx_['teacherOpenCourseMergeTeacherAddTime'], + }, + // { + // 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 = ''; + htm += ''; + return htm; + } + } + + ] ] + + }); + + table.on('checkbox(teacherOpenCourseMergeTeacherTable)', function(obj){ + var teacherOpenCourseMergeTeacher = obj.data; + if(obj.checked){ + //按钮逻辑Lib.buttonEnable() + }else{ + + } + }) + }, + + initSearchForm:function(){ + Lib.initSearchForm( $("#searchForm"),teacherOpenCourseMergeTeacherTable,form); + }, + + initToolBar:function(){ + toolbar = { + add: function () { + var url = "/jlw/teacherOpenCourseMergeTeacher/add.do"; + Common.openDlg(url,"课程开课关联教师管理>新增"); + }, + edit: function () { + var data = Common.getOneFromTable(table,"teacherOpenCourseMergeTeacherTable"); + if(data==null){ + return ; + } + var url = "/jlw/teacherOpenCourseMergeTeacher/add.do?teacherOpenCourseMergeTeacherId="+data.teacherOpenCourseMergeTeacherId; + Common.openDlg(url,"课程开课关联教师管理>"+data.teacherOpenCourseMergeTeacherId+">编辑"); + }, + del: function () { + layui.use(['del'], function(){ + var delView = layui.del + delView.delBatch(); + }); + }, + search: function () { + Lib.doSearchForm($("#searchForm"), teacherOpenCourseMergeTeacherTable, 1); + view.initToolBar() + }, + refresh: function () { + searchForm.reset(); + Lib.doSearchForm($("#searchForm"), teacherOpenCourseMergeTeacherTable, 1); + view.initToolBar() + }, + } + //触发事件 + $('.ext-toolbar').on('click', function() { + var type = $(this).data('type'); + toolbar[type] ? toolbar[type].call(this) : ''; + }); + + }, initTableTool: table.on('tool(teacherOpenCourseMergeTeacherTable)', function (obj) { + var data = obj.data; + if (obj.event === 'edit') { + var url = "/jlw/teacherOpenCourseMergeTeacher/add.do?teacherOpenCourseMergeTeacherId="+data.teacherOpenCourseMergeTeacherId; + Common.openDlg(url,"课程开课关联教师管理>"+data.teacherOpenCourseMergeTeacherId+">编辑"); + }else if(obj.event === "del"){ + layer.confirm('是否确定删除该信息？', function (index) { + var ret = Common.postAjax("/jlw/teacherOpenCourseMergeTeacher/delete.json",{ids:data.teacherOpenCourseMergeTeacherId}); + 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); + +}); diff --git a/web/src/main/resources/static/js/jlw/teacherOpenCourseMergeTeacher/teacherOpenCourseMergeTeacherApi.js b/web/src/main/resources/static/js/jlw/teacherOpenCourseMergeTeacher/teacherOpenCourseMergeTeacherApi.js new file mode 100644 index 00000000..3735c5f9 --- /dev/null +++ b/web/src/main/resources/static/js/jlw/teacherOpenCourseMergeTeacher/teacherOpenCourseMergeTeacherApi.js @@ -0,0 +1,18 @@ +/*访问后台的代码*/ +layui.define([], function(exports) { + var api={ + updateTeacherOpenCourseMergeTeacher:function(form,callback){ + Lib.submitForm("/jlw/teacherOpenCourseMergeTeacher/edit.json",form,{},callback) + }, + addTeacherOpenCourseMergeTeacher:function(form,callback){ + Lib.submitForm("/jlw/teacherOpenCourseMergeTeacher/add.json",form,{},callback) + }, + del:function(ids,callback){ + Common.post("/jlw/teacherOpenCourseMergeTeacher/delete.json",{"ids":ids},function(){ + callback(); + }) + } + + }; + exports('teacherOpenCourseMergeTeacherApi',api); +}); \ No newline at end of file diff --git a/web/src/main/resources/static/js/jlw/teacherOpenCourseScheduleSession/index.js b/web/src/main/resources/static/js/jlw/teacherOpenCourseScheduleSession/index.js index 09fe2310..99fabb2c 100644 --- a/web/src/main/resources/static/js/jlw/teacherOpenCourseScheduleSession/index.js +++ b/web/src/main/resources/static/js/jlw/teacherOpenCourseScheduleSession/index.js @@ -78,18 +78,18 @@ layui.define([ 'form', 'laydate', 'table' ], function(exports) { hide:$.isEmpty(sx_['teacherOpenCourseScheduleSessionStatusText'])?false:sx_['teacherOpenCourseScheduleSessionStatusText'], }, { - field : 'teacherOpenCourseId', - title : '课程开课ID', + field : 'teacherOpenCourseIdText', + title : '开课名称', align:"center", hideField :false, - hide:$.isEmpty(sx_['teacherOpenCourseId'])?false:sx_['teacherOpenCourseId'], + hide:$.isEmpty(sx_['teacherOpenCourseIdText'])?false:sx_['teacherOpenCourseIdText'], }, { - field : 'teacherId', - title : '教师ID', + field : 'teacherIdText', + title : '教师名称', align:"center", hideField :false, - hide:$.isEmpty(sx_['teacherId'])?false:sx_['teacherId'], + hide:$.isEmpty(sx_['teacherIdText'])?false:sx_['teacherIdText'], }, { field : 'schoolClassIds', diff --git a/web/src/main/resources/static/js/jlw/universityFaculty/index.js b/web/src/main/resources/static/js/jlw/universityFaculty/index.js index 8c331e1a..44523afc 100644 --- a/web/src/main/resources/static/js/jlw/universityFaculty/index.js +++ b/web/src/main/resources/static/js/jlw/universityFaculty/index.js @@ -104,7 +104,7 @@ layui.define([ 'form', 'laydate', 'table' ], function(exports) { // hideField :false, // hide:$.isEmpty(sx_['orgId'])?false:sx_['orgId'], // } - ,{ + { field : 'operation_',title : '操作',align:"center", templet: function (d) { var htm = ''; htm += ''; diff --git a/web/src/main/resources/static/js/jlw/universitySystem/index.js b/web/src/main/resources/static/js/jlw/universitySystem/index.js index 264824ac..87722192 100644 --- a/web/src/main/resources/static/js/jlw/universitySystem/index.js +++ b/web/src/main/resources/static/js/jlw/universitySystem/index.js @@ -75,13 +75,13 @@ layui.define([ 'form', 'laydate', 'table' ], function(exports) { hideField :false, hide:$.isEmpty(sx_['universitySystemStatusText'])?false:sx_['universitySystemStatusText'], }, - // { - // field : 'universityFacultyId', - // title : '院系ID（学院ID）', - // align:"center", - // hideField :false, - // hide:$.isEmpty(sx_['universityFacultyId'])?false:sx_['universityFacultyId'], - // }, + { + field : 'universityFacultyId', + title : '院系ID', + align:"center", + hideField :false, + hide:$.isEmpty(sx_['universityFacultyId'])?false:sx_['universityFacultyId'], + }, // { // field : 'userId', // title : '用户ID', @@ -96,7 +96,7 @@ layui.define([ 'form', 'laydate', 'table' ], function(exports) { // hideField :false, // hide:$.isEmpty(sx_['orgId'])?false:sx_['orgId'], // } - ,{ + { field : 'operation_',title : '操作',align:"center", templet: function (d) { var htm = ''; htm += ''; diff --git a/web/src/main/resources/templates/jlw/teacherOpenCourse/add.html b/web/src/main/resources/templates/jlw/teacherOpenCourse/add.html index d213b7d4..44f4225e 100644 --- a/web/src/main/resources/templates/jlw/teacherOpenCourse/add.html +++ b/web/src/main/resources/templates/jlw/teacherOpenCourse/add.html @@ -20,13 +20,15 @@
- + +
- + +
@@ -49,6 +51,17 @@
+
+
+
+
+ +
+ +
+
+
diff --git a/web/src/main/resources/templates/jlw/teacherOpenCourse/edit.html b/web/src/main/resources/templates/jlw/teacherOpenCourse/edit.html index 96174c6c..7e85dd9f 100644 --- a/web/src/main/resources/templates/jlw/teacherOpenCourse/edit.html +++ b/web/src/main/resources/templates/jlw/teacherOpenCourse/edit.html @@ -20,13 +20,15 @@
- + +
- + +
@@ -50,6 +52,17 @@
+
+
+
+ +
+ +
+
+
+
diff --git a/web/src/main/resources/templates/jlw/teacherOpenCourseMergeTeacher/add.html b/web/src/main/resources/templates/jlw/teacherOpenCourseMergeTeacher/add.html new file mode 100644 index 00000000..aa33687d --- /dev/null +++ b/web/src/main/resources/templates/jlw/teacherOpenCourseMergeTeacher/add.html @@ -0,0 +1,65 @@ + + +
+
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+
+
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+
+
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+
+ + + + + + diff --git a/web/src/main/resources/templates/jlw/teacherOpenCourseMergeTeacher/edit.html b/web/src/main/resources/templates/jlw/teacherOpenCourseMergeTeacher/edit.html new file mode 100644 index 00000000..c2b34d86 --- /dev/null +++ b/web/src/main/resources/templates/jlw/teacherOpenCourseMergeTeacher/edit.html @@ -0,0 +1,65 @@ + + +
+
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+
+
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+
+
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+
+ + + + + + diff --git a/web/src/main/resources/templates/jlw/teacherOpenCourseMergeTeacher/index.html b/web/src/main/resources/templates/jlw/teacherOpenCourseMergeTeacher/index.html new file mode 100644 index 00000000..43c035f1 --- /dev/null +++ b/web/src/main/resources/templates/jlw/teacherOpenCourseMergeTeacher/index.html @@ -0,0 +1,29 @@ + + + +
+ + + + diff --git a/web/src/main/resources/templates/jlw/teacherOpenCourseScheduleSession/add.html b/web/src/main/resources/templates/jlw/teacherOpenCourseScheduleSession/add.html index 641b1da1..3b5ca411 100644 --- a/web/src/main/resources/templates/jlw/teacherOpenCourseScheduleSession/add.html +++ b/web/src/main/resources/templates/jlw/teacherOpenCourseScheduleSession/add.html @@ -20,16 +20,18 @@
- + +
- +
- +
@@ -37,9 +39,10 @@
- +
- +
@@ -50,22 +53,6 @@
-
-
-
- -
- -
-
-
- -
- -
-
-
-
diff --git a/web/src/main/resources/templates/jlw/teacherOpenCourseScheduleSession/edit.html b/web/src/main/resources/templates/jlw/teacherOpenCourseScheduleSession/edit.html index d1b43d3b..2abfa844 100644 --- a/web/src/main/resources/templates/jlw/teacherOpenCourseScheduleSession/edit.html +++ b/web/src/main/resources/templates/jlw/teacherOpenCourseScheduleSession/edit.html @@ -1,103 +1,90 @@
-
-
-
- +
+
+
+
-
-
- +
+
+
-
-
-
-
-
-
- +
+
+
+
+
+
+ +
+ id="teacherOpenCourseScheduleSessionStatus" name="teacherOpenCourseScheduleSessionStatus" value="${teacherOpenCourseScheduleSession.teacherOpenCourseScheduleSessionStatus}" layVerify="" />
-
-
- +
+
+
- +
-
-
-
-
-
-
- +
+
+
+
+
+
+
- +
-
-
- +
+
+
-
-
-
-
-
-
- -
- -
-
-
- -
- -
-
-
-
-
-
-
- +
+
+
+
+
+
+
-
-
- +
+
+
-
-
-
-
-
-
- +
+
+
+
+
+
+
-
-
- +
+
+
-
-
-
+
+
+