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

排课增加标题字段

Browse Source
beetlsql3-dev
Mlxa0324 2 years ago
parent 64524bfd8c
commit 0f52082d52
9 changed files with 71 additions and 2 deletions
Show Stats Download Patch File Download Diff File

2
doc/sql/mysql/tianze-pro-update.sql
Unescape Escape View File

@ -558,3 +558,5 @@ alter table notice_read comment '通知公告等-已读时间记录';
ALTER TABLE teacher_open_course_chat_log ADD COLUMN chat_log_full_id varchar(2000) COMMENT '互动日志全路径ID';
ALTER TABLE school_class ADD COLUMN university_faculty_id bigint(20) COMMENT '院系ID';
ALTER TABLE teacher_open_course_schedule_session ADD COLUMN schedule_session_title varchar(60) COMMENT '排课标题';

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

@ -134,6 +134,10 @@ public class TeacherOpenCourseScheduleSession extends BaseEntity{
private boolean teacherOpenCourseScheduleSessionClassIsMultiple;
// 判断是否是多个教室
private String scheduleSessionTitle;
//组织ID
private Long orgId ;

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

@ -32,6 +32,11 @@ public class TeacherOpenCourseScheduleSessionOptions {
*/
@NotNull(message = "开课课程不能为空", groups =ValidateConfig.ADD.class)
private Long teacherOpenCourseId ;
/**
* 排课标题
*/
@NotNull(message = "排课标题不能为空", groups =ValidateConfig.ADD.class)
private String scheduleSessionTitle ;
/**
* 上课教师ID
*/

1
web/src/main/java/com/ibeetl/jlw/service/TeacherOpenCourseScheduleSessionService.java
Unescape Escape View File

@ -282,6 +282,7 @@ public class TeacherOpenCourseScheduleSessionService extends CoreBaseService<Tea
// 课表主表保存
TeacherOpenCourseScheduleSession tocss = new TeacherOpenCourseScheduleSession();
tocss.setTeacherOpenCourseScheduleSessionAddTime(DateUtil.beginOfHour(DateUtil.date()));
tocss.setScheduleSessionTitle(options.getScheduleSessionTitle());
tocss.setTeacherOpenCourseId(options.getTeacherOpenCourseId());
tocss.setSchoolClassIds(options.getSchoolClassIdPlural());
tocss.setTeacherOpenCourseScheduleSessionClassList(JSONUtil.toJsonStr(options.getSessionClassList()));

12
web/src/main/java/com/ibeetl/jlw/web/query/TeacherOpenCourseScheduleSessionQuery.java
Unescape Escape View File

@ -44,6 +44,10 @@ public class TeacherOpenCourseScheduleSessionQuery extends PageParam {
@Query(name = "开课节次", display = false)
private String teacherOpenCourseScheduleSessionClassList;
// 排课标题
private String scheduleSessionTitle;
/**
* 开课星期 多个逗号隔开
* 例：T1,T2,T3 代表星期一，星期二，星期三
@ -209,4 +213,12 @@ public class TeacherOpenCourseScheduleSessionQuery extends PageParam {
public void setTeacherOpenCourseScheduleSessionClassList(String teacherOpenCourseScheduleSessionClassList) {
this.teacherOpenCourseScheduleSessionClassList = teacherOpenCourseScheduleSessionClassList;
}
public String getScheduleSessionTitle() {
return scheduleSessionTitle;
}
public void setScheduleSessionTitle(String scheduleSessionTitle) {
this.scheduleSessionTitle = scheduleSessionTitle;
}
}

25
web/src/main/resources/sql/jlw/teacherOpenCourseScheduleSession.md
Unescape Escape View File

@ -84,6 +84,12 @@ queryByCondition
@if(!isEmpty(teacherOpenCourseScheduleSessionWeekNum)){
and t.teacher_open_course_schedule_session_week_num =#teacherOpenCourseScheduleSessionWeekNum#
@}
@if(!isEmpty(scheduleSessionTitle)){
and t.schedule_session_title =#scheduleSessionTitle#
@}
@if(!isEmpty(scheduleSessionTitle)){
and t.schedule_session_title =#scheduleSessionTitle#
@}
queryByConditionGroup
@ -102,6 +108,7 @@ queryByConditionGroup
count(1) AS open_course_day_count,
t.teacher_id,
t.school_class_Ids,
t.schedule_session_title,
t.teacher_open_course_schedule_session_start_date,
t.teacher_open_course_schedule_session_end_date,
t.teacher_open_course_schedule_session_week_num,
@ -174,12 +181,16 @@ queryByConditionGroup
@if(!isEmpty(teacherOpenCourseScheduleSessionWeekNum)){
and t.teacher_open_course_schedule_session_week_num =#teacherOpenCourseScheduleSessionWeekNum#
@}
@if(!isEmpty(scheduleSessionTitle)){
and t.schedule_session_title =#scheduleSessionTitle#
@}
group by
t.teacher_open_course_schedule_session_id,
t.teacher_open_course_schedule_session_status,
t.teacher_open_course_id,
t.teacher_id,
t.school_class_Ids,
t.schedule_session_title,
t.teacher_open_course_schedule_session_start_date,
t.teacher_open_course_schedule_session_end_date,
t.teacher_open_course_schedule_session_week_num,
@ -264,6 +275,9 @@ queryByConditionQuery
@if(!isEmpty(teacherOpenCourseScheduleSessionWeekNum)){
and t.teacher_open_course_schedule_session_week_num =#teacherOpenCourseScheduleSessionWeekNum#
@}
@if(!isEmpty(scheduleSessionTitle)){
and t.schedule_session_title =#scheduleSessionTitle#
@}
@ -434,6 +448,9 @@ getTeacherOpenCourseScheduleSessionValues
@if(!isEmpty(teacherOpenCourseScheduleSessionStatusWeekDetail)){
and t.teacher_open_course_schedule_session_status_week_detail like #"%"+teacherOpenCourseScheduleSessionStatusWeekDetail+"%"#
@}
@if(!isEmpty(scheduleSessionTitle)){
and t.schedule_session_title =#scheduleSessionTitle#
@}
getValuesByQuery
@ -505,19 +522,23 @@ getValuesByQuery
@if(!isEmpty(teacherOpenCourseScheduleSessionStatusWeekDetail)){
and t.teacher_open_course_schedule_session_status_week_detail like #"%"+teacherOpenCourseScheduleSessionStatusWeekDetail+"%"#
@}
@if(!isEmpty(scheduleSessionTitle)){
and t.schedule_session_title =#scheduleSessionTitle#
@}
getSessionNameList
===
* 导入课程，下拉列表
SELECT
ta.teacher_open_course_title,
t.schedule_session_title,
t.teacher_open_course_schedule_session_id
FROM
teacher_open_course_schedule_session t
LEFT JOIN teacher_open_course ta ON ta.teacher_open_course_id = t.teacher_open_course_id
inner JOIN teacher_open_course ta ON ta.teacher_open_course_id = t.teacher_open_course_id
WHERE
1 = 1
AND t.teacher_open_course_schedule_session_status = 1
AND ta.teacher_open_course_status = 1
@if(!isEmpty(teacherOpenCourseId)){
and t.teacher_open_course_id =#teacherOpenCourseId#
@}

7
web/src/main/resources/static/js/jlw/teacherOpenCourseScheduleSession/add.js
Unescape Escape View File

@ -374,6 +374,7 @@ layui.define(['form', 'laydate', 'table', 'xmSelect', 'teacherOpenCourseSchedule
initSubmit:function(){
$("#addButton").click(function(){
var teacherOpenCourseScheduleSessionId = $("#addForm input[name='teacherOpenCourseScheduleSessionId']").val();
var scheduleSessionTitle = $("#addForm input[name='scheduleSessionTitle']").val();
var teacherOpenCourseId = $("#addForm select[name='teacherOpenCourseId']").val();
var teacherId = $("#addForm select[name='teacherId']").val();
var schoolClassIds = demo1.getValue('value').join(",");
@ -392,12 +393,17 @@ layui.define(['form', 'laydate', 'table', 'xmSelect', 'teacherOpenCourseSchedule
}
})
var teacherOpenCourseScheduleSessionStartDate = $("#addForm input[name='teacherOpenCourseScheduleSessionStartDate']").val();
var teacherOpenCourseScheduleSessionStartDate = $("#addForm input[name='teacherOpenCourseScheduleSessionStartDate']").val();
var teacherOpenCourseScheduleSessionWeekNum = $("#addForm input[name='teacherOpenCourseScheduleSessionWeekNum']").val();
var teacherOpenCourseScheduleSessionOpenOnHolidays = $("#addForm input:radio[name='teacherOpenCourseScheduleSessionOpenOnHolidays']:checked").val();
var teacherOpenCourseScheduleSessionTagWeek = [];
$("#addForm input[name='teacherOpenCourseScheduleSessionTagWeek']:checked").each(function (i, v) {
teacherOpenCourseScheduleSessionTagWeek.push($(this).val());//teacherOpenCourseScheduleSessionTagWeek
});
if ($.isEmpty(scheduleSessionTitle)) {
layer.msg('排课标题未填写!!', {icon: 5});
return;
}
if ($.isEmpty(teacherOpenCourseId)) {
layer.msg('开课课程未选!!', {icon: 5});
return;
@ -440,6 +446,7 @@ layui.define(['form', 'laydate', 'table', 'xmSelect', 'teacherOpenCourseSchedule
shade: [0.5]
});
var param = {
scheduleSessionTitle: scheduleSessionTitle,
teacherOpenCourseScheduleSessionId: teacherOpenCourseScheduleSessionId,
teacherOpenCourseId: teacherOpenCourseId,
teacherId: teacherId,

7
web/src/main/resources/static/js/jlw/teacherOpenCourseScheduleSession/index.js
Unescape Escape View File

@ -30,6 +30,13 @@ layui.define([ 'form', 'laydate', 'table' ,'laytpl'], function(exports) {
,defaultToolbar: ['filter', 'print', 'exports'] //头部右侧工具栏*/
,limit : 10,
cols : [ [ // 表头
{
field: 'scheduleSessionTitle',
title: '排课标题',
align: "center",
hideField: false,
hide:$.isEmpty(sx_['scheduleSessionTitle'])?false:sx_['scheduleSessionTitle'],
},
{
field: 'teacherOpenCourseIdText',
title: '开课名称',

10
web/src/main/resources/templates/jlw/teacherOpenCourseScheduleSession/add.html
Unescape Escape View File

@ -28,6 +28,16 @@
<layui:submitButtons id="addButton" buttonType="" showExamine="2"/>
</div>
<div class="layui-row">
<div class="layui-form-item">
<div class="layui-inline">
<label class="layui-form-label">排课标题</label>
<div class="layui-input-inline">
<input type="text" name="scheduleSessionTitle" value="${teacherOpenCourseScheduleSession.scheduleSessionTitle!''}" class="layui-input">
</div>
</div>
</div>
</div>
<div class="layui-row">
<div class="layui-form-item">
<div class="layui-inline">

Write Preview
Loading…
Cancel
Save