tianzeOrg
/
tianze-pro
8
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

班级管理增加专业

Browse Source
beetlsql3-dev
xuliangtong 3 years ago
parent 6132346d5c
commit 9fea2f3d12
10 changed files with 96 additions and 10 deletions
Show Stats Download Patch File Download Diff File

11
admin-core/src/main/resources/static/js/lib.js
Unescape Escape View File

@ -974,6 +974,17 @@ var Lib = {
$(key).empty();
$(key).append(htm);
layui.form.render();
},getClassByUniSys:function (key, sysId){ //根据专业获取班级
var ret = Common.getAjax("/jlw/schoolClass/getValues.json",{universitySystemId: sysId});
var htm = '<option value="">请选择</option>';
if(ret.code == 0){
for (var i = 0;i < ret.data.length;i++){
htm += '<option value="'+ret.data[i].classId+'">'+ret.data[i].className+'</option>';
}
}
$(key).empty();
$(key).append(htm);
layui.form.render();
},repLaceString:function (str){ //替换所有标签转义 <:&lt; >:&gt;
if(!$.isEmpty(str)){
return str.replace(/</g,'&lt;').replace(/>/g,'&gt;');

14
web/src/main/java/com/ibeetl/jlw/entity/SchoolClass.java
Unescape Escape View File

@ -26,6 +26,12 @@ public class SchoolClass extends BaseEntity{
@NotNull(message = "请选择院校", groups =ValidateConfig.ADD.class)
private Long universitiesCollegesId ;
/**
* 专业ID
*/
@Dict(type="university_system.university_system_name.university_system_status=1")
private Long universitySystemId ;
//班级名称
@NotNull(message = "请填写班级名称", groups =ValidateConfig.ADD.class)
private String className ;
@ -53,6 +59,14 @@ public class SchoolClass extends BaseEntity{
public SchoolClass(){
}
public Long getUniversitySystemId() {
return universitySystemId;
}
public void setUniversitySystemId(Long universitySystemId) {
this.universitySystemId = universitySystemId;
}
/**ID
*@return
*/

5
web/src/main/java/com/ibeetl/jlw/web/StudentController.java
Unescape Escape View File

@ -1,5 +1,6 @@
package com.ibeetl.jlw.web;
import cn.hutool.core.util.ObjectUtil;
import cn.jlw.Interceptor.*;
import cn.jlw.token.TokenService;
import cn.jlw.util.JupyterNotebookUtils;
@ -2008,9 +2009,12 @@ public class StudentController{
Student student = studentService.queryById(studentId);
view.addObject("student", student);
universitiesColleges.setOrgId(student.getOrgId());
SchoolClass schoolClass = schoolClassService.queryById(student.getClassId());
view.addObject("universitySystemId", schoolClass != null ? schoolClass.getUniversitySystemId() : "");
}else {
view.addObject("student", new Student());
universitiesColleges.setOrgId(coreUser.getOrgId());
view.addObject("universitySystemId","");
}
List<UniversitiesColleges> universitiesCollegesList = universitiesCollegesService.getValues(universitiesColleges);
if(universitiesCollegesList.size() > 0){
@ -2019,6 +2023,7 @@ public class StudentController{
}else {
view.addObject("universitiesCollegesId", null);
}
view.addObject("beTeacher",null != coreUser && "JT_S_02".equals(coreUser.getJobType1())?1:2);//是否是教师 1是 2否
return view;
}

11
web/src/main/java/com/ibeetl/jlw/web/query/SchoolClassQuery.java
Unescape Escape View File

@ -20,6 +20,8 @@ public class SchoolClassQuery extends PageParam {
private Long universitiesCollegesId;
@Query(name = "班级名称", display = true)
private String className;
@Query(name = "专业名称", display = false)
private Long universitySystemId ;;
@Query(name = "班级编号", display = true)
private String classSn;
@Query(name = "状态（1正常 2删除）", display = false)
@ -79,6 +81,14 @@ public class SchoolClassQuery extends PageParam {
this.userId = userId;
}
public Long getUniversitySystemId() {
return universitySystemId;
}
public void setUniversitySystemId(Long universitySystemId) {
this.universitySystemId = universitySystemId;
}
public SchoolClass pojo(){
SchoolClass pojo = new SchoolClass();
pojo.setClassId(this.getClassId());
@ -89,6 +99,7 @@ public class SchoolClassQuery extends PageParam {
pojo.setAddTime(this.getAddTime());
pojo.setOrgId(this.getOrgId());
pojo.setUserId(this.getUserId());
pojo.setUniversitySystemId(this.getUniversitySystemId());
return pojo;
}

9
web/src/main/resources/sql/jlw/schoolClass.md
Unescape Escape View File

@ -16,6 +16,9 @@ queryByCondition
@if(!isEmpty(universitiesCollegesId)){
and t.universities_colleges_id =#universitiesCollegesId#
@}
@if(!isEmpty(universitySystemId)){
and t.university_system_id =#universitySystemId#
@}
@if(!isEmpty(className)){
and t.class_name like #'%'+className+'%'#
@}
@ -59,6 +62,9 @@ getSchoolClassValues
@if(!isEmpty(universitiesCollegesId)){
and t.universities_colleges_id =#universitiesCollegesId#
@}
@if(!isEmpty(universitySystemId)){
and t.university_system_id =#universitySystemId#
@}
@if(!isEmpty(className)){
and t.class_name like #'%'+className+'%'#
@}
@ -93,6 +99,9 @@ getValuesByQuery
@if(!isEmpty(universitiesCollegesId)){
and t.universities_colleges_id =#universitiesCollegesId#
@}
@if(!isEmpty(universitySystemId)){
and t.university_system_id =#universitySystemId#
@}
@if(!isEmpty(className)){
and t.class_name like #'%'+className+'%'#
@}

9
web/src/main/resources/static/js/jlw/schoolClass/add.js
Unescape Escape View File

@ -48,5 +48,14 @@ layui.define([ 'form', 'laydate', 'table','schoolClassApi'], function(exports) {
}
}
$(".rightUniversitySystemAdd").click(function (){
sessionStorage.setItem("student_tag",($("input[name='studentId']").val() || '-1'));
var url = "/jlw/universitySystem/add.do";
Common.openDlg(url,"");
});
form.on('select(select_universitiesColleges)', function (obj) {
Lib.getUniversitySystems($("select[name='universitySystemId']"),obj.value);
});
exports('add',view);
});

4
web/src/main/resources/static/js/jlw/schoolClass/index.js
Unescape Escape View File

@ -30,6 +30,10 @@ layui.define([ 'form', 'laydate', 'table' ], function(exports) {
field : 'universitiesCollegesIdText',
title : '院校',align: "center",hide:$("input[name='beTeacher']").val() == 1?true:false //beTeacher :1是院校老师 2：不是
},
{
field : 'universitySystemIdText',
title : '专业名称',align: "center"
},
{
field : 'className',
title : '班级名称',align: "center"

12
web/src/main/resources/static/js/jlw/student/add.js
Unescape Escape View File

@ -54,11 +54,21 @@ layui.define([ 'form', 'laydate', 'table','studentApi'], function(exports) {
Common.openDlg(url,"");
});
//去添加专业
$(".rightOffUniversityAdd").click(function (){
sessionStorage.setItem("student_tag",($("input[name='studentId']").val() || '-1'));
var url = "/jlw/universitySystem/add.do";
Common.openDlg(url,"");
});
//根据所选学校查询班级
form.on('select(select_universitiesColleges)', function (obj) {
Lib.getSchoolClass($("select[name='classId']"),obj.value);
Lib.getUniversitySystems($("select[name='universitySystemId']"),obj.value);
});
form.on('select(select_universitySystemId)', function (obj) {
Lib.getClassByUniSys($("select[name='classId']"),obj.value);
});
exports('add',view);
});

14
web/src/main/resources/templates/jlw/schoolClass/add.html
Unescape Escape View File

@ -12,11 +12,23 @@
<label class="layui-form-label"><span class="req">*</span>所属院校：</label>
<div class="layui-input-inline">
<layui:simpleDictSelect style='layui-input-inline' value="${schoolClass.universitiesCollegesId}" type="universities_colleges.universities_colleges_name.universities_colleges_status=1"
id="universitiesCollegesId" name="universitiesCollegesId"/>
id="universitiesCollegesId" name="universitiesCollegesId" layFilter="select_universitiesColleges"/>
</div>
</div>
</div>
</div>
<div class="layui-row">
<div class="layui-form-item">
<div class="layui-inline">
<label class="layui-form-label"><span class="req">*</span>专业：</label>
<div class="layui-input-inline">
<layui:simpleDictSelect style='layui-input-inline' value="${schoolClass.universitySystemId}" type="university_system.university_system_name.university_system_status=1,university_faculty_id=${schoolClass.universitiesCollegesId}"
id="universitySystemId" name="universitySystemId"/>
</div>
</div>
<button type="button" class="layui-btn layui-btn-sm rightUniversitySystemAdd bg_button">去添加</button>
</div>
</div>
<!--#} -->
<div class="layui-row">
<div class="layui-form-item">

15
web/src/main/resources/templates/jlw/student/add.html
Unescape Escape View File

@ -21,27 +21,28 @@
<div class="layui-row">
<div class="layui-form-item">
<div class="layui-inline">
<label class="layui-form-label"><span class="req">*</span>班级：</label>
<label class="layui-form-label"><span class="req">*</span>专业：</label>
<div class="layui-input-inline">
<layui:simpleDictSelect style='layui-input-inline' value="${student.classId}" type="school_class.class_name.class_status=1,universities_colleges_id=${universitiesCollegesId}"
id="classId" name="classId"/>
<layui:simpleDictSelect style='layui-input-inline' value="${universitySystemId}" type="university_system.university_system_name.university_system_status=1,university_faculty_id=${universitiesCollegesId}"
id="universitySystemId" name="universitySystemId" layFilter="select_universitySystemId" />
</div>
</div>
<button type="button" class="layui-btn layui-btn-sm rightOffClassAdd bg_button">去添加</button>
<button type="button" class="layui-btn layui-btn-sm rightOffUniversityAdd bg_button">去添加</button>
</div>
</div>
<div class="layui-row">
<div class="layui-form-item">
<div class="layui-inline">
<label class="layui-form-label"><span class="req">*</span>专业：</label>
<label class="layui-form-label"><span class="req">*</span>班级：</label>
<div class="layui-input-inline">
<layui:simpleDictSelect style='layui-input-inline' value="${student.classId}" type="university_system.university_system_name.university_system_status=1,university_faculty_id=${universitiesCollegesId}"
id="universitySystemId" name="universitySystemId"/>
<layui:simpleDictSelect style='layui-input-inline' value="${student.classId}" type="school_class.class_name.class_status=1,university_system_id=${universitySystemId}"
id="classId" name="classId"/>
</div>
</div>
<button type="button" class="layui-btn layui-btn-sm rightOffClassAdd bg_button">去添加</button>
</div>
</div>
<!--#}else{-->
<input type="hidden" name="universitiesCollegesId" value="${universitiesCollegesId}">
<div class="layui-row">

Write Preview
Loading…
Cancel
Save