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

学生班级专业院系院校修改

Browse Source
beetlsql3-dev
xuliangtong 2 years ago
parent 0bff01f13f
commit 9cf9dd700e
15 changed files with 90 additions and 21 deletions
Show Stats Download Patch File Download Diff File

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

@ -986,7 +986,18 @@ var Lib = {
$(key).empty();
$(key).append(htm);
layui.form.render();
},getUniversitySystems:function (key, classId){ //获取专业
},getUniversityFacultys:function (key, universitiesCollegesId){ //根据院校获取院系
var ret = Common.getAjax("/jlw/universityFaculty/getValues.json",{universitiesCollegesId: universitiesCollegesId});
var htm = '<option value="">请选择</option>';
if(ret.code == 0){
for (var i = 0;i < ret.data.length;i++){
htm += '<option value="'+ret.data[i].universityFacultyId+'">'+ret.data[i].universityFacultyName+'</option>';
}
}
$(key).empty();
$(key).append(htm);
layui.form.render();
},getUniversitySystems:function (key, classId){ //根据院系获取专业
var ret = Common.getAjax("/jlw/universitySystem/getValues.json",{universityFacultyId: classId});
var htm = '<option value="">请选择</option>';
if(ret.code == 0){

2
web/src/main/java/com/ibeetl/jlw/entity/UniversityFaculty.java
Unescape Escape View File

@ -38,7 +38,7 @@ public class UniversityFaculty extends BaseEntity{
private String universityFacultyContactAddress ;
//院校ID （院系的上一级）
@Dict(type = "universities_colleges.universities_colleges_name.universities_colleges_status=1")
private Long universitiesCollegesId ;
//状态（ 1 正常 2删除）

4
web/src/main/java/com/ibeetl/jlw/entity/UniversitySystem.java
Unescape Escape View File

@ -43,9 +43,9 @@ public class UniversitySystem extends BaseEntity{
private Integer universitySystemStatus ;
//院系ID（学院ID）
@Dict(type="university_faculty.university_faculty_name.university_faculty_status=1")
private Long universityFacultyId ;
//用户ID
private Long userId ;

7
web/src/main/java/com/ibeetl/jlw/web/SchoolClassController.java
Unescape Escape View File

@ -8,8 +8,10 @@ import com.ibeetl.admin.core.file.FileService;
import com.ibeetl.admin.core.web.JsonResult;
import com.ibeetl.jlw.entity.SchoolClass;
import com.ibeetl.jlw.entity.UniversitiesColleges;
import com.ibeetl.jlw.entity.UniversitySystem;
import com.ibeetl.jlw.service.SchoolClassService;
import com.ibeetl.jlw.service.UniversitiesCollegesService;
import com.ibeetl.jlw.service.UniversitySystemService;
import com.ibeetl.jlw.web.query.SchoolClassQuery;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
@ -44,6 +46,8 @@ public class SchoolClassController{
@Resource private SchoolClassService schoolClassService;
@Resource private UniversitiesCollegesService universitiesCollegesService;
@Resource private UniversitySystemService systemService;
@Resource
FileService fileService;
@ -82,8 +86,11 @@ public class SchoolClassController{
if(classId != null){
SchoolClass schoolClass = schoolClassService.queryById(classId);
view.addObject("schoolClass", schoolClass);
UniversitySystem info = systemService.getInfo(schoolClass.getUniversitySystemId());
view.addObject("universityFacultyId", info.getUniversityFacultyId());
}else {
view.addObject("schoolClass",new SchoolClass());
view.addObject("universityFacultyId","");
}
view.addObject("beTeacher",null != coreUser && "JT_S_02".equals(coreUser.getJobType1())?1:2);//是否是教师 1是 2否
return view;

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

@ -69,6 +69,8 @@ public class StudentController{
@Resource private UniversitiesCollegesService universitiesCollegesService;
@Resource private UniversitySystemService universitySystemService;
@Resource private SchoolClassService schoolClassService;
@Resource private StudentDirectMessagesService studentDirectMessagesService;
@ -2011,11 +2013,14 @@ public class StudentController{
view.addObject("student", student);
universitiesColleges.setOrgId(student.getOrgId());
SchoolClass schoolClass = schoolClassService.queryById(student.getClassId());
UniversitySystem info = universitySystemService.getInfo(schoolClass.getUniversitySystemId());
view.addObject("universitySystemId", schoolClass != null ? schoolClass.getUniversitySystemId() : "");
view.addObject("universityFacultyId", info != null ? info.getUniversityFacultyId() : "");
}else {
view.addObject("student", new Student());
universitiesColleges.setOrgId(coreUser.getOrgId());
view.addObject("universitySystemId","");
view.addObject("universityFacultyId","");
}
List<UniversitiesColleges> universitiesCollegesList = universitiesCollegesService.getValues(universitiesColleges);
if(universitiesCollegesList.size() > 0){

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

@ -6,7 +6,9 @@ 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.UniversityFaculty;
import com.ibeetl.jlw.entity.UniversitySystem;
import com.ibeetl.jlw.service.UniversityFacultyService;
import com.ibeetl.jlw.service.UniversitySystemService;
import com.ibeetl.jlw.web.query.UniversitySystemQuery;
import org.apache.commons.lang3.StringUtils;
@ -39,6 +41,8 @@ public class UniversitySystemController{
@Resource private UniversitySystemService universitySystemService;
@Resource private UniversityFacultyService facultyService;
@Resource
FileService fileService;
@ -109,9 +113,16 @@ public class UniversitySystemController{
ModelAndView view = new ModelAndView("/jlw/universitySystem/add.html");
if(null != universitySystemId){
UniversitySystem universitySystem = universitySystemService.queryById(universitySystemId);
UniversityFaculty universityFaculty = facultyService.queryById(universitySystem.getUniversityFacultyId());
if (universityFaculty != null) {
view.addObject("universitiesCollegesId", universityFaculty.getUniversitiesCollegesId());
}else {
view.addObject("universitiesCollegesId", "");
}
view.addObject("universitySystem", universitySystem);
}else {
view.addObject("universitySystem", new UniversitySystem());
view.addObject("universitiesCollegesId", "");
}
return view;
}

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

@ -55,6 +55,9 @@ layui.define([ 'form', 'laydate', 'table','schoolClassApi'], function(exports) {
Common.openDlg(url,"");
});
form.on('select(select_universitiesColleges)', function (obj) {
Lib.getUniversityFacultys($("select[name='universityFacultyId']"),obj.value);
});
form.on('select(select_universityFacultyIds)', function (obj) {
Lib.getUniversitySystems($("select[name='universitySystemId']"),obj.value);
});
exports('add',view);

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

@ -61,12 +61,17 @@ layui.define([ 'form', 'laydate', 'table','studentApi'], function(exports) {
Common.openDlg(url,"");
});
//根据所选学校查询班级
//根据所选学校查询院系
form.on('select(select_universitiesColleges)', function (obj) {
Lib.getUniversitySystems($("select[name='universitySystemId']"),obj.value);
Lib.getUniversityFacultys($("select[name='universityFacultyId']"),obj.value);
});
//查询专业
form.on('select(select_universityFacultyIds)', function (obj) {
Lib.getUniversitySystems($("select[name='universitySystemId']"),obj.value);
});
//查询班级
form.on('select(select_universitySystemId)', function (obj) {
Lib.getClassByUniSys($("select[name='classId']"),obj.value);
});

14
web/src/main/resources/static/js/jlw/universityFaculty/index.js
Unescape Escape View File

@ -68,13 +68,13 @@ layui.define([ 'form', 'laydate', 'table' ], function(exports) {
hideField :false,
hide:$.isEmpty(sx_['universityFacultyContactAddress'])?false:sx_['universityFacultyContactAddress'],
},
// {
// field : 'universitiesCollegesId',
// title : '院校ID （院系的上一级）',
// align:"center",
// hideField :false,
// hide:$.isEmpty(sx_['universitiesCollegesId'])?false:sx_['universitiesCollegesId'],
// },
{
field : 'universitiesCollegesIdText',
title : '院校名称',
align:"center",
hideField :false,
hide:$.isEmpty(sx_['universitiesCollegesIdText'])?false:sx_['universitiesCollegesIdText'],
},
{
field : 'universityFacultyStatusText', //数据字典类型为 global_status
title : '状态',

4
web/src/main/resources/static/js/jlw/universitySystem/add.js
Unescape Escape View File

@ -34,5 +34,9 @@ layui.define([ 'form', 'laydate', 'table','universitySystemApi'], function(expor
}
}
//选择院校后查询院系
form.on('select(select_universitiesCollegesIds)', function (obj) {
Lib.getUniversityFacultys($("select[name='universityFacultyId']"),obj.value);
});
exports('add',view);
});

6
web/src/main/resources/static/js/jlw/universitySystem/index.js
Unescape Escape View File

@ -76,11 +76,11 @@ layui.define([ 'form', 'laydate', 'table' ], function(exports) {
hide:$.isEmpty(sx_['universitySystemStatusText'])?false:sx_['universitySystemStatusText'],
},
{
field : 'universityFacultyId',
title : '院系ID',
field : 'universityFacultyIdText',
title : '院系',
align:"center",
hideField :false,
hide:$.isEmpty(sx_['universityFacultyId'])?false:sx_['universityFacultyId'],
hide:$.isEmpty(sx_['universityFacultyIdText'])?false:sx_['universityFacultyIdText'],
},
// {
// field : 'userId',

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

@ -17,12 +17,23 @@
</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="${universityFacultyId}" type="university_faculty.university_faculty_name.university_faculty_status=1,universities_colleges_id=${schoolClass.universitiesCollegesId}"
id="universityFacultyId" name="universityFacultyId" layFilter="select_universityFacultyIds"/>
</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}"
<layui:simpleDictSelect style='layui-input-inline' value="${schoolClass.universitySystemId}" type="university_system.university_system_name.university_system_status=1,university_faculty_id=${universityFacultyId}"
id="universitySystemId" name="universitySystemId"/>
</div>
</div>

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

@ -18,12 +18,23 @@
<button type="button" class="layui-btn layui-btn-sm rightOffAdd 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>
<div class="layui-input-inline">
<layui:simpleDictSelect style='layui-input-inline' value="${universityFacultyId}" type="university_faculty.university_faculty_name.university_faculty_status=1,universities_colleges_id=${universitiesCollegesId}"
id="universityFacultyId" name="universityFacultyId" layFilter="select_universityFacultyIds"/>
</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="${universitySystemId}" type="university_system.university_system_name.university_system_status=1,university_faculty_id=${universitiesCollegesId}"
<layui:simpleDictSelect style='layui-input-inline' value="${universitySystemId}" type="university_system.university_system_name.university_system_status=1,university_faculty_id=${universityFacultyId}"
id="universitySystemId" name="universitySystemId" layFilter="select_universitySystemId" />
</div>
</div>

3
web/src/main/resources/templates/jlw/universityFaculty/add.html
Unescape Escape View File

@ -6,7 +6,8 @@
<div class="layui-inline">
<label class="layui-form-label">院校名称</label>
<div class="layui-input-inline">
<input type="text" id="id1" name="id1" value="${universityFaculty.id1}" class="layui-input" >
<layui:simpleDictSelect style='layui-input-inline' value="${universityFaculty.universitiesCollegesId}" type="universities_colleges.universities_colleges_name.universities_colleges_status=1"
id="universitiesCollegesId" name="universitiesCollegesId" layFilter="universitiesCollegesId"/>
</div>
</div>
<div class="layui-inline">

4
web/src/main/resources/templates/jlw/universitySystem/add.html
Unescape Escape View File

@ -6,14 +6,14 @@
<div class="layui-inline">
<label class="layui-form-label">院校名称</label>
<div class="layui-input-inline">
<layui:simpleDictSelect style='layui-input-inline' value="" type="universities_colleges.universities_colleges_name.universities_colleges_status=1"
<layui:simpleDictSelect style='layui-input-inline' value="${universitiesCollegesId}" type="universities_colleges.universities_colleges_name.universities_colleges_status=1"
id="universitiesCollegesId" name="universitiesCollegesId" layFilter="select_universitiesCollegesIds"/>
</div>
</div>
<div class="layui-inline">
<label class="layui-form-label">所属学院</label>
<div class="layui-input-inline">
<layui:simpleDictSelect style='layui-input-inline' value="" type="university_faculty.university_faculty_name.university_faculty_status=1"
<layui:simpleDictSelect style='layui-input-inline' value="${universitySystem.universityFacultyId}" type="university_faculty.university_faculty_name.university_faculty_status=1,universities_colleges_id=${universitiesCollegesId}"
id="universityFacultyId" name="universityFacultyId" layFilter="select_universityFacultyIds"/>
</div>
</div>

Write Preview
Loading…
Cancel
Save