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

Merge remote-tracking branch 'origin/beetlsql3-dev' into beetlsql3-dev

Browse Source 
# Conflicts:
#	web/src/main/java/com/ibeetl/jlw/web/query/TeacherOpenCourseScheduleSessionQuery.java
#	web/src/main/resources/static/js/jlw/teacherOpenCourseScheduleSession/index.js
beetlsql3-dev
姚丹ab
parent 0b5b89f3a5 4cd7af92fb
commit 1d8f20d070
9 changed files with 27 additions and 23 deletions

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

@ -29080,7 +29080,7 @@ DROP TABLE IF EXISTS `teacher_open_course_schedule_session`;
CREATE TABLE `teacher_open_course_schedule_session` (
`teacher_open_course_schedule_session_id` bigint(20) NOT NULL COMMENT '课程开课-排课位置ID',
`teacher_open_course_schedule_session_add_time` datetime NULL DEFAULT NULL COMMENT '创建时间',
`teacher_open_course_schedule_session_status` int(11) NULL DEFAULT NULL COMMENT '状态（1正常 2删除）',
`teacher_open_course_schedule_session_status` int(11) NULL DEFAULT NULL COMMENT '状态（1启用 2禁用）',
`teacher_open_course_id` bigint(20) NULL DEFAULT NULL COMMENT '课程开课ID',
`teacher_id` bigint(20) NULL DEFAULT NULL COMMENT '教师ID',
`school_class_Ids` varchar(4000) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '班级ID集合',

2
web/src/main/java/com/ibeetl/jlw/dao/TeacherOpenCourseScheduleSessionDao.java
Unescape Escape View File

@ -22,7 +22,7 @@ interface TeacherOpenCourseScheduleSessionDao extends BaseMapper<TeacherOpenCour
PageQuery<TeacherOpenCourseScheduleSession> queryByCondition(PageQuery query);
PageQuery<TeacherOpenCourseScheduleSession> queryByConditionQuery(PageQuery query);
@Update
void deleteTeacherOpenCourseScheduleSessionByIds(String ids);
void logicDeleteTeacherOpenCourseScheduleSessionByIds(String ids);
@Update
void deleteByIds(String ids);
@Update

1
web/src/main/java/com/ibeetl/jlw/dao/TeacherOpenCourseScheduleSessionSnapDao.java
Unescape Escape View File

@ -36,7 +36,6 @@ public interface TeacherOpenCourseScheduleSessionSnapDao extends BaseMapper<Teac
Collection<Object> ts = Arrays.asList(sessionIds.split(","));
createLambdaQuery()
.andIn(TeacherOpenCourseScheduleSessionSnap::getTeacherOpenCourseScheduleSessionId, ts)
.andEq(TeacherOpenCourseScheduleSessionSnap::getTeacherOpenCourseScheduleSessionSnapStatus, 1)
.delete();
}
@Update

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

@ -44,7 +44,7 @@ public class TeacherOpenCourseScheduleSession extends BaseEntity{
private Date teacherOpenCourseScheduleSessionAddTime ;
//状态（1正常 2删除）
//状态（1启用 2禁用）
@Dict(type="global_open_status")
private Integer teacherOpenCourseScheduleSessionStatus ;

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

@ -42,6 +42,7 @@ import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.validation.annotation.Validated;
import javax.validation.constraints.NotEmpty;
import javax.validation.constraints.NotNull;
import java.util.*;
import java.util.stream.Collectors;
@ -127,9 +128,18 @@ public class TeacherOpenCourseScheduleSessionService extends CoreBaseService<Tea
}
}
public void deleteTeacherOpenCourseScheduleSession(String ids){
public void deleteByIds(@NotEmpty String ids) {
try {
teacherOpenCourseScheduleSessionDao.deleteTeacherOpenCourseScheduleSessionByIds(ids);
teacherOpenCourseScheduleSessionDao.deleteByIds(ids);
teacherOpenCourseScheduleSessionSnapDao.deleteTeacherOpenCourseScheduleSessionBySessionIds(ids);
} catch (Exception e) {
throw new PlatformException("批量删除新增排课失败", e);
}
}
public void logicDeleteTeacherOpenCourseScheduleSessionByIds(String ids){
try {
teacherOpenCourseScheduleSessionDao.logicDeleteTeacherOpenCourseScheduleSessionByIds(ids);
} catch (Exception e) {
throw new PlatformException("批量删除新增排课失败", e);
}
@ -395,8 +405,7 @@ public class TeacherOpenCourseScheduleSessionService extends CoreBaseService<Tea
String teacherOpenCourseScheduleSessionId = teacherOpenCourseScheduleSessionOptions.getTeacherOpenCourseScheduleSessionId().toString();
// 这里两张表 真删除
teacherOpenCourseScheduleSessionDao.deleteByIds(teacherOpenCourseScheduleSessionId);
teacherOpenCourseScheduleSessionSnapDao.deleteTeacherOpenCourseScheduleSessionBySessionIds(teacherOpenCourseScheduleSessionId);
deleteByIds(teacherOpenCourseScheduleSessionId);
// 排课记录表
addSessionByOption(teacherOpenCourseScheduleSessionOptions);

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

@ -264,7 +264,7 @@ public class TeacherOpenCourseScheduleSessionController{
@Function("teacherOpenCourseScheduleSession.delete")
@ResponseBody
public JsonResult delete(String ids) {
teacherOpenCourseScheduleSessionService.deleteTeacherOpenCourseScheduleSession(ids);
teacherOpenCourseScheduleSessionService.deleteByIds(ids);
return JsonResult.success();
}

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

@ -21,7 +21,7 @@ public class TeacherOpenCourseScheduleSessionQuery extends PageParam {
private Long teacherOpenCourseId;
@Query(name = "教师名称", display = true,type=Query.TYPE_DICT,dict="teacher.teacher_name.teacher_status=1")
private Long teacherId;
@Query(name = "启用状态", display = true,type=Query.TYPE_DICT,dict="global_open_status")/*状态（1正常 2禁用）*/
@Query(name = "启用状态", display = true,type=Query.TYPE_DICT,dict="global_open_status")/*状态（1启用 2禁用）*/
private Integer teacherOpenCourseScheduleSessionStatus;
@Query(name = "班级ID集合", display = false)
private String schoolClassIds;

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

@ -95,7 +95,7 @@ queryByConditionGroup
@}
from (
select
any_value(t.teacher_open_course_schedule_session_id) as teacher_open_course_schedule_session_id,
t.teacher_open_course_schedule_session_id,
t.teacher_open_course_schedule_session_status,
t.teacher_open_course_id,
@// 共多少天
@ -175,6 +175,7 @@ queryByConditionGroup
and t.teacher_open_course_schedule_session_week_num =#teacherOpenCourseScheduleSessionWeekNum#
@}
group by
t.teacher_open_course_schedule_session_id,
t.teacher_open_course_schedule_session_status,
t.teacher_open_course_id,
t.teacher_id,
@ -263,7 +264,7 @@ queryByConditionQuery
deleteTeacherOpenCourseScheduleSessionByIds
logicDeleteTeacherOpenCourseScheduleSessionByIds
===
* 批量删除（假删除）
update teacher_open_course_schedule_session set teacher_open_course_schedule_session_status = 2 where find_in_set(teacher_open_course_schedule_session_id,#ids#)

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

@ -94,7 +94,7 @@ layui.define([ 'form', 'laydate', 'table' ,'laytpl'], function(exports) {
hideField: false,
hide: $.isEmpty(sx_['teacherOpenCourseScheduleSessionStatusText']) ? false : sx_['teacherOpenCourseScheduleSessionStatusText'],
templet:function (d) {
var css = d.teacherOpenCourseScheduleSessionStatus == 2 ? "textType2" : 'textType';
var css = d.teacherOpenCourseScheduleSessionStatusText == 2 ? "textType2" : 'textType';
return '<span class="' + css + '">' +d.teacherOpenCourseScheduleSessionStatusText + '</span>'
}
},
@ -182,12 +182,10 @@ layui.define([ 'form', 'laydate', 'table' ,'laytpl'], function(exports) {
}else if(obj.event == 'look'){
lookInfoDate(data);
} else if (obj.event == "enable") {
var param = {
teacherOpenCourseScheduleSessionId: data.teacherOpenCourseScheduleSessionId,
teacherOpenCourseScheduleSessionStatus:1
};
layer.confirm('是否确定启用该信息？', function (index) {
var ret = Common.postAjax("/jlw/teacherOpenCourseScheduleSession/edit.json",param);
var ret = Common.postAjax("/jlw/teacherOpenCourseScheduleSession/edit.json",
{teacherOpenCourseScheduleSessionId: data.teacherOpenCourseScheduleSessionId,teacherOpenCourseScheduleSessionStatus:1});
layer.msg(ret.code == 0 ? "启用成功！" : ret.msg, {
offset: ['50%'],
icon: ret.code == 0 ? 1 : 2,
@ -199,12 +197,9 @@ layui.define([ 'form', 'laydate', 'table' ,'laytpl'], function(exports) {
});
});
} else if (obj.event == "disable") {
var param = {
teacherOpenCourseScheduleSessionId: data.teacherOpenCourseScheduleSessionId,
teacherOpenCourseScheduleSessionStatus:2
};
layer.confirm('是否确定禁用该信息？', function (index) {
var ret = Common.postAjax("/jlw/teacherOpenCourseScheduleSession/edit.json",param);
var ret = Common.postAjax("/jlw/teacherOpenCourseScheduleSession/edit.json",
{teacherOpenCourseScheduleSessionId: data.teacherOpenCourseScheduleSessionId,teacherOpenCourseScheduleSessionStatus:2});
layer.msg(ret.code == 0 ? "禁用成功！" : ret.msg, {
offset: ['50%'],
icon: ret.code == 0 ? 1 : 2,

Write Preview
Loading…
Cancel
Save