Merge remote-tracking branch 'origin/beetlsql3-dev' into beetlsql3-dev
# Conflicts: # web/src/main/resources/static/js/jlw/competition/add.js # web/src/main/resources/templates/jlw/competition/add.htmlbeetlsql3-dev
姚丹ab
2 years ago
commit
469112c96d
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
@ -0,0 +1,28 @@
|
||||
package com.ibeetl.jlw.dao;
|
||||
|
||||
import com.ibeetl.jlw.entity.TeacherOpenCourseMergeStudent;
|
||||
import com.ibeetl.jlw.web.query.TeacherOpenCourseMergeStudentQuery;
|
||||
import org.beetl.sql.core.engine.PageQuery;
|
||||
import org.beetl.sql.mapper.BaseMapper;
|
||||
import org.beetl.sql.mapper.annotation.SqlResource;
|
||||
import org.beetl.sql.mapper.annotation.Update;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
* 开课关联学生 Dao
|
||||
*/
|
||||
@SqlResource("jlw.teacherOpenCourseMergeStudent")
|
||||
public interface TeacherOpenCourseMergeStudentDao extends BaseMapper<TeacherOpenCourseMergeStudent>{
|
||||
PageQuery<TeacherOpenCourseMergeStudent> queryByCondition(PageQuery query);
|
||||
PageQuery<TeacherOpenCourseMergeStudent> queryByConditionQuery(PageQuery query);
|
||||
@Update
|
||||
void deleteTeacherOpenCourseMergeStudentByIds(String ids);
|
||||
@Update
|
||||
void deleteByIds(String ids);
|
||||
@Update
|
||||
int updateGivenByIds(TeacherOpenCourseMergeStudentQuery teacherOpenCourseMergeStudentQuery);
|
||||
List<TeacherOpenCourseMergeStudent> getByIds(String ids);
|
||||
List<TeacherOpenCourseMergeStudent> getValuesByQuery(TeacherOpenCourseMergeStudentQuery teacherOpenCourseMergeStudentQuery);
|
||||
List<TeacherOpenCourseMergeStudent> getValuesByQueryNotWithPermission(TeacherOpenCourseMergeStudentQuery teacherOpenCourseMergeStudentQuery);
|
||||
}
|
||||
@ -0,0 +1,32 @@
|
||||
package com.ibeetl.jlw.enums;
|
||||
|
||||
import cn.jlw.util.EnumUtil;
|
||||
import lombok.Getter;
|
||||
import org.beetl.sql.annotation.entity.EnumMapping;
|
||||
|
||||
/**
|
||||
* 学生加入课程的加入类型
|
||||
*/
|
||||
@EnumMapping("name")
|
||||
public enum OpenCourseMergeJoinTypeEnum {
|
||||
// 进行中
|
||||
code_join(0, "授权码方式加入"),
|
||||
// 已结束
|
||||
class_join(1, "班级方式加入");
|
||||
|
||||
@Getter
|
||||
private Integer code;
|
||||
|
||||
@Getter
|
||||
private String text;
|
||||
|
||||
|
||||
OpenCourseMergeJoinTypeEnum(Integer code, String text) {
|
||||
this.text = text;
|
||||
this.code = code;
|
||||
}
|
||||
|
||||
public static OpenCourseMergeJoinTypeEnum getByCode(Integer code) {
|
||||
return EnumUtil.getByFieldWithValue(OpenCourseMergeJoinTypeEnum.class, "code", code);
|
||||
}
|
||||
}
|
||||
File diff suppressed because it is too large
Load Diff
@ -0,0 +1,38 @@
|
||||
layui.define([ 'form', 'laydate', 'table','teacherOpenCourseMergeStudentApi'], function(exports) {
|
||||
var form = layui.form;
|
||||
var teacherOpenCourseMergeStudentApi = layui.teacherOpenCourseMergeStudentApi;
|
||||
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 teacherOpenCourseSchoolClassMergeStudentId = $("#addForm input[name='teacherOpenCourseSchoolClassMergeStudentId']").val();
|
||||
if(!$.isEmpty(teacherOpenCourseSchoolClassMergeStudentId)){
|
||||
teacherOpenCourseMergeStudentApi.updateTeacherOpenCourseMergeStudent($('#addForm'),function(){
|
||||
parent.window.dataReload();
|
||||
Common.info("更新成功");
|
||||
Lib.closeFrame();
|
||||
});
|
||||
}else{
|
||||
teacherOpenCourseMergeStudentApi.addTeacherOpenCourseMergeStudent($('#addForm'),function(){
|
||||
parent.window.dataReload();
|
||||
Common.info("添加成功");
|
||||
Lib.closeFrame();
|
||||
});
|
||||
}
|
||||
|
||||
});
|
||||
});
|
||||
|
||||
$("#addButton-cancel").click(function(){
|
||||
Lib.closeFrame();
|
||||
});
|
||||
}
|
||||
|
||||
}
|
||||
exports('add',view);
|
||||
});
|
||||
@ -0,0 +1,23 @@
|
||||
layui.define(['table', 'teacherOpenCourseMergeStudentApi'], function(exports) {
|
||||
var teacherOpenCourseMergeStudentApi = layui.teacherOpenCourseMergeStudentApi;
|
||||
var table=layui.table;
|
||||
var view = {
|
||||
init:function(){
|
||||
},
|
||||
delBatch:function(){
|
||||
var data = Common.getMoreDataFromTable(table,"teacherOpenCourseMergeStudentTable");
|
||||
if(data==null){
|
||||
return ;
|
||||
}
|
||||
Common.openConfirm("确认要删除这些开课关联学生?",function(){
|
||||
var ids =Common.concatBatchId(data,"teacherOpenCourseSchoolClassMergeStudentId");
|
||||
teacherOpenCourseMergeStudentApi.del(ids,function(){
|
||||
Common.info("删除成功");
|
||||
dataReload();
|
||||
})
|
||||
})
|
||||
}
|
||||
}
|
||||
exports('del',view);
|
||||
|
||||
});
|
||||
@ -0,0 +1,28 @@
|
||||
layui.define([ 'form', 'laydate', 'table','teacherOpenCourseMergeStudentApi'], function(exports) {
|
||||
var form = layui.form;
|
||||
var teacherOpenCourseMergeStudentApi = layui.teacherOpenCourseMergeStudentApi;
|
||||
var index = layui.index;
|
||||
var view = {
|
||||
init:function(){
|
||||
Lib.initGenrealForm($("#updateForm"),form);
|
||||
this.initSubmit();
|
||||
},
|
||||
initSubmit:function(){
|
||||
$("#updateButton").click(function(){
|
||||
form.on('submit(form)', function(){
|
||||
teacherOpenCourseMergeStudentApi.updateTeacherOpenCourseMergeStudent($('#updateForm'),function(){
|
||||
parent.window.dataReload();
|
||||
Common.info("更新成功");
|
||||
Lib.closeFrame();
|
||||
});
|
||||
});
|
||||
});
|
||||
$("#updateButton-cancel").click(function(){
|
||||
Lib.closeFrame();
|
||||
});
|
||||
}
|
||||
|
||||
}
|
||||
exports('edit',view);
|
||||
|
||||
});
|
||||
@ -0,0 +1,18 @@
|
||||
/*访问后台的代码*/
|
||||
layui.define([], function(exports) {
|
||||
var api={
|
||||
updateTeacherOpenCourseMergeStudent:function(form,callback){
|
||||
Lib.submitForm("/jlw/teacherOpenCourseMergeStudent/edit.json",form,{},callback)
|
||||
},
|
||||
addTeacherOpenCourseMergeStudent:function(form,callback){
|
||||
Lib.submitForm("/jlw/teacherOpenCourseMergeStudent/add.json",form,{},callback)
|
||||
},
|
||||
del:function(ids,callback){
|
||||
Common.post("/jlw/teacherOpenCourseMergeStudent/delete.json",{"ids":ids},function(){
|
||||
callback();
|
||||
})
|
||||
}
|
||||
|
||||
};
|
||||
exports('teacherOpenCourseMergeStudentApi',api);
|
||||
});
|
||||
File diff suppressed because it is too large
Load Diff
@ -0,0 +1,29 @@
|
||||
<!--#layout("/common/layout.html",{"jsBase":"/js/jlw/teacherOpenCourseMergeStudent/"}){ -->
|
||||
<layui:searchForm formId="searchForm" searchList="" condition="${search}">
|
||||
</layui:searchForm>
|
||||
<table id="teacherOpenCourseMergeStudentTable" lay-filter="teacherOpenCourseMergeStudentTable"></table>
|
||||
<!--#} -->
|
||||
|
||||
<script type="text/html" id="toolbar_teacherOpenCourseMergeStudent">
|
||||
<div class="layui-btn-container">
|
||||
<div class="layui-btn-group" >
|
||||
<!--# if(core.searchIsShow(search)) {-->
|
||||
<layui:accessButton function="teacherOpenCourseMergeStudent.query" id="searchFormSearch" action="search"><i class="layui-icon"></i>搜索</layui:accessButton>
|
||||
<!--# }-->
|
||||
<layui:accessButton function="teacherOpenCourseMergeStudent.add" action="add">添加</layui:accessButton>
|
||||
<layui:accessButton function="teacherOpenCourseMergeStudent.edit" action="edit">修改</layui:accessButton>
|
||||
<layui:accessButton function="teacherOpenCourseMergeStudent.del" action="del">删除</layui:accessButton>
|
||||
<!--# if(!isEmpty(search)) {-->
|
||||
<layui:accessButton function="teacherOpenCourseMergeStudent.query" action="refresh"><i class="layui-icon"></i>刷新</layui:accessButton>
|
||||
<!--# }-->
|
||||
</div>
|
||||
</div>
|
||||
</script>
|
||||
<script>
|
||||
|
||||
layui.use(['index'], function(){
|
||||
var index = layui.index;
|
||||
index.init();
|
||||
});
|
||||
|
||||
</script>
|
||||
Loading…
Reference in New Issue