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 b3d119a86b
commit c1680ff2bc
16 changed files with 1788 additions and 1530 deletions
Show Stats Download Patch File Download Diff File

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

@ -1025,6 +1025,17 @@ var Lib = {
$(key).empty();
$(key).append(htm);
layui.form.render();
},getClassByteacherOpenCourseNotice:function (key, sysId){ //根据开课id查询班级
var ret = Common.getAjax("/jlw/teacherOpenCourseNotice/getClass.json",{teacherOpenCourseIds: 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;');

862
data_base_design/天泽数据大平台.pdb
View File

File diff suppressed because it is too large Load Diff

2190
data_base_design/天泽数据大平台.pdm
View File

File diff suppressed because it is too large Load Diff

3
web/src/main/java/com/ibeetl/jlw/dao/TeacherOpenCourseNoticeDao.java
Unescape Escape View File

@ -24,4 +24,7 @@ public interface TeacherOpenCourseNoticeDao extends BaseMapper<TeacherOpenCourse
int updateGivenByIds(TeacherOpenCourseNoticeQuery teacherOpenCourseNoticeQuery);
List<TeacherOpenCourseNotice> getByIds(String ids);
List<TeacherOpenCourseNotice> getValuesByQuery(TeacherOpenCourseNoticeQuery teacherOpenCourseNoticeQuery);
List<SchoolClass> getClassByOpenCourseId(TeacherOpenCourseNotice teacherOpenCourseNotice);
}

28
web/src/main/java/com/ibeetl/jlw/entity/Teacher.java
Unescape Escape View File

@ -27,6 +27,18 @@ public class Teacher extends BaseEntity implements TokenInterface{
@Dict(type="universities_colleges.universities_colleges_name.universities_colleges_status=1")
private Long universitiesCollegesId ;
/**
* 院系ID
*/
@Dict(type="university_faculty.university_faculty_name.university_faculty_status=1")
private Long universityFacultyId;
/**
* 专业ID
*/
@Dict(type="university_system.university_system_name.university_system_status=1")
private Long universitySystemId ;
//教师姓名
@NotBlank(message = "请填写教师姓名", groups =ValidateConfig.ADD.class)
private String teacherName ;
@ -242,4 +254,20 @@ public class Teacher extends BaseEntity implements TokenInterface{
public MenuEnums getIdentity() {
return MenuEnums.JT_S_05;
}
public Long getUniversitySystemId() {
return universitySystemId;
}
public void setUniversitySystemId(Long universitySystemId) {
this.universitySystemId = universitySystemId;
}
public Long getUniversityFacultyId() {
return universityFacultyId;
}
public void setUniversityFacultyId(Long universityFacultyId) {
this.universityFacultyId = universityFacultyId;
}
}

43
web/src/main/java/com/ibeetl/jlw/entity/TeacherOpenCourseNotice.java
Unescape Escape View File

@ -8,6 +8,8 @@ import org.beetl.sql.annotation.entity.*;
import com.ibeetl.admin.core.util.ValidateConfig;
import com.ibeetl.admin.core.annotation.Dict;
import org.beetl.sql.fetch.annotation.Fetch;
import org.beetl.sql.fetch.annotation.FetchSql;
import java.math.BigDecimal;
import java.util.Date;
@ -16,6 +18,7 @@ import java.util.Date;
* 教师-课程开课-通知公告
* gen by Spring Boot2 Admin 2022-10-06
*/
@Fetch
public class TeacherOpenCourseNotice extends BaseEntity{
//系统通知公告ID
@ -29,10 +32,36 @@ public class TeacherOpenCourseNotice extends BaseEntity{
private String schoolClassIds ;
@FetchSql(
"@if(strUtil.equalsIgnoreCase(schoolClassIds, 'ALL')) { \n" +
"select '所有班级' \n" +
"@} else { \n" +
" select group_concat(class_name) " +
"from school_class " +
"where 1 = 1 " +
"and find_in_set(class_id, #schoolClassIds#) " +
"and class_status = 1 " +
"order by class_id " +
"@}\n" )
private String schoolClassIdsText;
//课程开课ID（多个逗号隔开）
private String teacherOpenCourseIds ;
@FetchSql(
"@if(strUtil.equalsIgnoreCase(teacherOpenCourseIds, 'ALL')) { \n" +
"select '所有课程' \n" +
"@} else { \n" +
" select group_concat(teacher_open_course_title) " +
"from teacher_open_course " +
"where 1 = 1 " +
"and find_in_set(teacher_open_course_id, #teacherOpenCourseIds#) " +
"and teacher_open_course_status = 1 " +
"order by teacher_open_course_id " +
"@}\n" )
private String teacherOpenCourseIdsText;
//消息标题
private String noticeTitle ;
@ -197,5 +226,19 @@ public class TeacherOpenCourseNotice extends BaseEntity{
this.delFlag = delFlag;
}
public String getSchoolClassIdsText() {
return schoolClassIdsText;
}
public void setSchoolClassIdsText(String schoolClassIdsText) {
this.schoolClassIdsText = schoolClassIdsText;
}
public String getTeacherOpenCourseIdsText() {
return teacherOpenCourseIdsText;
}
public void setTeacherOpenCourseIdsText(String teacherOpenCourseIdsText) {
this.teacherOpenCourseIdsText = teacherOpenCourseIdsText;
}
}

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

@ -15,6 +15,7 @@ import com.ibeetl.admin.core.util.TimeTool;
import com.ibeetl.admin.core.web.JsonResult;
import com.ibeetl.admin.core.web.JsonReturnCode;
import com.ibeetl.jlw.dao.TeacherOpenCourseNoticeDao;
import com.ibeetl.jlw.entity.SchoolClass;
import com.ibeetl.jlw.entity.TeacherOpenCourseNotice;
import com.ibeetl.jlw.web.query.TeacherOpenCourseNoticeQuery;
import com.ibeetl.jlw.entity.FileEntity;
@ -162,4 +163,8 @@ public class TeacherOpenCourseNoticeService extends CoreBaseService<TeacherOpenC
}
}
public List<SchoolClass> getClassByOpenCourseId(TeacherOpenCourseNoticeQuery param) {
TeacherOpenCourseNotice pojo = param.pojo();
return teacherOpenCourseNoticeDao.getClassByOpenCourseId(pojo);
}
}

19
web/src/main/java/com/ibeetl/jlw/web/TeacherOpenCourseNoticeController.java
Unescape Escape View File

@ -177,6 +177,12 @@ public class TeacherOpenCourseNoticeController{
teacherOpenCourseNoticeQuery.setOrgId(coreUser.getOrgId());
teacherOpenCourseNoticeQuery.setCreateTime(new Date());
teacherOpenCourseNoticeQuery.setDelFlag(0);
if (StringUtils.isEmpty(teacherOpenCourseNoticeQuery.getSchoolClassIds())) {
teacherOpenCourseNoticeQuery.setSchoolClassIds("ALL");
}
if(StringUtils.isEmpty(teacherOpenCourseNoticeQuery.getTeacherOpenCourseIds())) {
teacherOpenCourseNoticeQuery.setTeacherOpenCourseIds("ALL");
}
return teacherOpenCourseNoticeService.add(teacherOpenCourseNoticeQuery);
}
}
@ -189,6 +195,12 @@ public class TeacherOpenCourseNoticeController{
}else {
teacherOpenCourseNoticeQuery.setUserId(null);
teacherOpenCourseNoticeQuery.setOrgId(null);
if (StringUtils.isEmpty(teacherOpenCourseNoticeQuery.getSchoolClassIds())) {
teacherOpenCourseNoticeQuery.setSchoolClassIds("ALL");
}
if(StringUtils.isEmpty(teacherOpenCourseNoticeQuery.getTeacherOpenCourseIds())) {
teacherOpenCourseNoticeQuery.setTeacherOpenCourseIds("ALL");
}
String msg = teacherOpenCourseNoticeService.edit(teacherOpenCourseNoticeQuery);
if (StringUtils.isBlank(msg)) {
return JsonResult.success();
@ -222,5 +234,12 @@ public class TeacherOpenCourseNoticeController{
return JsonResult.success();
}
@GetMapping(MODEL + "/getClass.json")
public JsonResult<List<SchoolClass>>getClassByOpenCourseId(TeacherOpenCourseNoticeQuery param) {
List<SchoolClass>list = teacherOpenCourseNoticeService.getClassByOpenCourseId(param);
return JsonResult.success(list);
}
}

24
web/src/main/java/com/ibeetl/jlw/web/query/TeacherQuery.java
Unescape Escape View File

@ -15,6 +15,12 @@ public class TeacherQuery extends PageParam {
@Query(name = "院校名称", display = true, type = Query.TYPE_DICT,
dict = "universities_colleges.universities_colleges_name.universities_colleges_status=1")
private Long universitiesCollegesId;
@Query(name = "院系名称", display = true, type = Query.TYPE_DICT,
dict = "university_faculty.university_faculty_name.university_faculty_status=1")
private Long universityFacultyId;
@Query(name = "专业名称", display = true, type = Query.TYPE_DICT,
dict = "university_system.university_system_name.university_system_status=1")
private Long universitySystemId;
@Query(name = "教师姓名", display = true)
private String teacherName;
@Query(name = "教师编号", display = false)
@ -160,6 +166,8 @@ public class TeacherQuery extends PageParam {
pojo.setAddTime(this.getAddTime());
pojo.setOrgId(this.getOrgId());
pojo.setUserId(this.getUserId());
pojo.setUniversityFacultyId(this.getUniversityFacultyId());
pojo.setUniversitySystemId(this.getUniversitySystemId());
return pojo;
}
@ -218,4 +226,20 @@ public class TeacherQuery extends PageParam {
public void setTeacherStatuses(String teacherStatuses) {
this.teacherStatuses = teacherStatuses;
}
public Long getUniversityFacultyId() {
return universityFacultyId;
}
public void setUniversityFacultyId(Long universityFacultyId) {
this.universityFacultyId = universityFacultyId;
}
public Long getUniversitySystemId() {
return universitySystemId;
}
public void setUniversitySystemId(Long universitySystemId) {
this.universitySystemId = universitySystemId;
}
}

45
web/src/main/resources/sql/jlw/teacher.md
Unescape Escape View File

@ -30,6 +30,12 @@ queryByCondition
@if(!isEmpty(universitiesCollegesId)){
and t.universities_colleges_id =#universitiesCollegesId#
@}
@if(!isEmpty(universityFacultyId)){
and t.university_faculty_id =#universityFacultyId#
@}
@if(!isEmpty(universitySystemId)){
and t.university_system_id =#universitySystemId#
@}
@if(!isEmpty(teacherName)){
and t.teacher_name like #'%'+teacherName+'%'#
@}
@ -133,6 +139,12 @@ getExcelValues
@if(!isEmpty(universitiesCollegesId)){
and t.universities_colleges_id =#universitiesCollegesId#
@}
@if(!isEmpty(universityFacultyId)){
and t.university_faculty_id =#universityFacultyId#
@}
@if(!isEmpty(universitySystemId)){
and t.university_system_id =#universitySystemId#
@}
@if(!isEmpty(teacherName)){
and t.teacher_name like #'%'+teacherName+'%'#
@}
@ -157,6 +169,12 @@ getExcelValues
@if(!isEmpty(universitiesCollegesId)){
and t.universities_colleges_id =#universitiesCollegesId#
@}
@if(!isEmpty(universityFacultyId)){
and t.university_faculty_id =#universityFacultyId#
@}
@if(!isEmpty(universitySystemId)){
and t.university_system_id =#universitySystemId#
@}
@if(!isEmpty(teacherName)){
and t.teacher_name like #'%'+teacherName+'%'#
@}
@ -191,6 +209,12 @@ getExcelValues2Competition
@if(!isEmpty(teacherSn)){
and t.teacher_sn like #'%'+teacherSn+'%'#
@}
@if(!isEmpty(universityFacultyId)){
and t.university_faculty_id =#universityFacultyId#
@}
@if(!isEmpty(universitySystemId)){
and t.university_system_id =#universitySystemId#
@}
@if(!isEmpty(competitionId)){
-- 1只包含参赛评委 2不包含参赛评委
@if(beCompetitionJudge == 1){
@ -208,9 +232,7 @@ getExcelValues2Competition
@}
@}
)
UNION ALL
(
SELECT
a.universities_colleges_name,
@ -231,6 +253,12 @@ getExcelValues2Competition
@if(!isEmpty(teacherSn)){
and t.teacher_sn like #'%'+teacherSn+'%'#
@}
@if(!isEmpty(universityFacultyId)){
and t.university_faculty_id =#universityFacultyId#
@}
@if(!isEmpty(universitySystemId)){
and t.university_system_id =#universitySystemId#
@}
@if(!isEmpty(competitionId)){
-- 1只包含参赛评委 2不包含参赛评委
@if(beCompetitionJudge == 1){
@ -298,6 +326,12 @@ getTeacherValues
@if(!isEmpty(userId)){
and t.user_id =#userId#
@}
@if(!isEmpty(universityFacultyId)){
and t.university_faculty_id =#universityFacultyId#
@}
@if(!isEmpty(universitySystemId)){
and t.university_system_id =#universitySystemId#
@}
getIdsByQuery
@ -356,14 +390,13 @@ getTeacherLog
getStatisticsLog
===
SELECT
TRIM(REPLACE(t.application_name,'子应用','')) platform,
a.teacher_count,a.teacher_online_count,
b.student_count,b.student_online_count
FROM resources_application t
LEFT JOIN (
SELECT t.platform,COUNT(t.teacher_id) teacher_count,SUM(CASE WHEN t.last_operate_time > date_add(NOW(), interval -1 hour) THEN 1 ELSE 0 END)teacher_online_count FROM
(
SELECT
@ -386,11 +419,8 @@ getStatisticsLog
WHERE b.resources_application_id > 0
)t GROUP BY t.teacher_id,t.platform
)t GROUP BY t.platform
)a ON a.platform = TRIM(REPLACE(t.application_name,'子应用',''))
LEFT JOIN (
SELECT t.platform, COUNT(student_id)student_count,SUM(CASE WHEN last_operate_time > date_add(NOW(), interval -1 hour) THEN 1 ELSE 0 END)student_online_count FROM
(
SELECT
@ -420,5 +450,4 @@ getStatisticsLog
WHERE a.params LIKE '%studentEnd\\_%'
)t GROUP BY t.student_id,t.platform
)t GROUP BY t.platform
)b ON b.platform = TRIM(REPLACE(t.application_name,'子应用',''))

12
web/src/main/resources/sql/jlw/teacherOpenCourseNotice.md
Unescape Escape View File

@ -295,3 +295,15 @@ getValuesByQuery
from student b left join school_class ba on ba.class_id = b.class_id
where b.student_status = 1 and ba.class_status = 1 and b.student_id = #studentId# ), t.school_class_ids)
@}
getClassByOpenCourseId
===
* 根据开课课程查询关联的班级
select * from school_class where class_status = 1
and find_in_set(class_id,
(select group_concat(school_class_id)
from teacher_open_course_merge_school_class
where teacher_open_course_merge_school_class_status = 1
and teacher_open_course_id = ${teacherOpenCourseNotice.teacherOpenCourseIds}))

6
web/src/main/resources/static/js/jlw/teacher/add.js
Unescape Escape View File

@ -59,5 +59,11 @@ layui.define([ 'form', 'laydate', 'table','teacherApi'], function(exports) {
}
}
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);
});

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

@ -29,6 +29,12 @@ layui.define(['form', 'laydate', 'table'], function (exports) {
{
field: 'universitiesCollegesIdText', title: '院校名称', align: "center"
},
{
field: 'universityFacultyIdText', title: '院系名称', align: "center"
},
{
field: 'universitySystemIdText', title: '专业名称', align: "center"
},
{
field: 'teacherName', title: '教师姓名', align: "center"
},

5
web/src/main/resources/static/js/jlw/teacherOpenCourseNotice/add.js
Unescape Escape View File

@ -37,5 +37,10 @@ layui.define([ 'form', 'laydate', 'table','teacherOpenCourseNoticeApi', 'layedit
}
}
form.on('select(select_courseInfoIds)', function (obj) {
Lib.getClassByteacherOpenCourseNotice($("select[name='schoolClassIds']"),obj.value);
});
exports('add',view);
});

25
web/src/main/resources/templates/jlw/teacher/add.html
Unescape Escape View File

@ -16,6 +16,31 @@
<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="${teacher.universityFacultyId}" type="university_faculty.university_faculty_name.university_faculty_status=1,universities_colleges_id=${teacher.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="${teacher.universitySystemId}" type="university_system.university_system_name.university_system_status=1,university_faculty_id=${teacher.universityFacultyId}"
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">
<div class="layui-inline">

20
web/src/main/resources/templates/jlw/teacherOpenCourseNotice/add.html
Unescape Escape View File

@ -17,21 +17,31 @@
<div class="layui-inline">
<label class="layui-form-label">通知对象</label>
<div class="layui-input-inline">
<!-- <input type="text" placeholder="请选择课程名称" id="teacherOpenCourseIds" name="teacherOpenCourseIds" value="${teacherOpenCourseNotice.teacherOpenCourseIds}" class="layui-input" >-->
<layui:simpleDictSelect style='layui-input-inline' placeholder="请选择课程名称"
value="${teacherOpenCourseNotice.teacherOpenCourseIds}" type="course_info.course_info_name.course_info_status=1,course_info_type=1"
value="${teacherOpenCourseNotice.teacherOpenCourseIds}" type="teacher_open_course.teacher_open_course_title.teacher_open_course_status=1"
id="teacherOpenCourseIds" name="teacherOpenCourseIds" layFilter="select_courseInfoIds"/>
</div>
</div>
<!--#if(teacherOpenCourseNotice.schoolClassIds == null){-->
<div class="layui-inline">
<label class="layui-form-label"></label>
<div class="layui-input-inline">
<!-- <input type="text" placeholder="请选择班级名称" id="schoolClassIds" name="schoolClassIds" value="${teacherOpenCourseNotice.schoolClassIds}" class="layui-input" >-->
<layui:simpleDictSelect style='layui-input-inline' placeholder="请选择班级名称"
value="${teacherOpenCourseNotice.schoolClassIds}" type="school_class.class_name.class_status=1"
id="schoolClassIds" name="schoolClassIds" layFilter="select_courseInfoIds"/>
value="${teacherOpenCourseNotice.schoolClassIds}" type="school_class.class_name.class_status=1,find_in_set(class_id,(select group_concat(school_class_id) from teacher_open_course_merge_school_class where teacher_open_course_merge_school_class_status = 1 and teacher_open_course_id='all'))"
id="schoolClassIds" name="schoolClassIds" layFilter="select_schoolClassIds"/>
</div>
</div>
<!--#}else { -->
<div class="layui-inline">
<label class="layui-form-label"></label>
<div class="layui-input-inline">
<layui:simpleDictSelect style='layui-input-inline' placeholder="请选择班级名称"
value="${teacherOpenCourseNotice.schoolClassIds}" type="school_class.class_name.class_status=1,find_in_set(class_id,(select group_concat(school_class_id) from teacher_open_course_merge_school_class where teacher_open_course_merge_school_class_status = 1 and teacher_open_course_id=${teacherOpenCourseNotice.teacherOpenCourseIds}))"
id="schoolClassIds" name="schoolClassIds" layFilter="select_schoolClassIds"/>
</div>
</div>
<!--#} -->
</div>
</div>

Write Preview
Loading…
Cancel
Save