diff --git a/doc/sql/mysql/tianze-pro.sql b/doc/sql/mysql/tianze-pro.sql index 7b516587..e3e0653e 100644 --- a/doc/sql/mysql/tianze-pro.sql +++ b/doc/sql/mysql/tianze-pro.sql @@ -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集合', diff --git a/web/src/main/java/com/ibeetl/jlw/dao/TeacherOpenCourseScheduleSessionDao.java b/web/src/main/java/com/ibeetl/jlw/dao/TeacherOpenCourseScheduleSessionDao.java index 6e890376..eb0a185b 100644 --- a/web/src/main/java/com/ibeetl/jlw/dao/TeacherOpenCourseScheduleSessionDao.java +++ b/web/src/main/java/com/ibeetl/jlw/dao/TeacherOpenCourseScheduleSessionDao.java @@ -22,7 +22,7 @@ interface TeacherOpenCourseScheduleSessionDao extends BaseMapper queryByCondition(PageQuery query); PageQuery queryByConditionQuery(PageQuery query); @Update - void deleteTeacherOpenCourseScheduleSessionByIds(String ids); + void logicDeleteTeacherOpenCourseScheduleSessionByIds(String ids); @Update void deleteByIds(String ids); @Update diff --git a/web/src/main/java/com/ibeetl/jlw/dao/TeacherOpenCourseScheduleSessionSnapDao.java b/web/src/main/java/com/ibeetl/jlw/dao/TeacherOpenCourseScheduleSessionSnapDao.java index 6b540bda..016d3079 100644 --- a/web/src/main/java/com/ibeetl/jlw/dao/TeacherOpenCourseScheduleSessionSnapDao.java +++ b/web/src/main/java/com/ibeetl/jlw/dao/TeacherOpenCourseScheduleSessionSnapDao.java @@ -36,7 +36,6 @@ public interface TeacherOpenCourseScheduleSessionSnapDao extends BaseMapper ts = Arrays.asList(sessionIds.split(",")); createLambdaQuery() .andIn(TeacherOpenCourseScheduleSessionSnap::getTeacherOpenCourseScheduleSessionId, ts) - .andEq(TeacherOpenCourseScheduleSessionSnap::getTeacherOpenCourseScheduleSessionSnapStatus, 1) .delete(); } @Update diff --git a/web/src/main/java/com/ibeetl/jlw/entity/TeacherOpenCourseScheduleSession.java b/web/src/main/java/com/ibeetl/jlw/entity/TeacherOpenCourseScheduleSession.java index 5d134c20..0a532393 100644 --- a/web/src/main/java/com/ibeetl/jlw/entity/TeacherOpenCourseScheduleSession.java +++ b/web/src/main/java/com/ibeetl/jlw/entity/TeacherOpenCourseScheduleSession.java @@ -44,7 +44,7 @@ public class TeacherOpenCourseScheduleSession extends BaseEntity{ private Date teacherOpenCourseScheduleSessionAddTime ; - //状态(1正常 2删除) + //状态(1启用 2禁用) @Dict(type="global_open_status") private Integer teacherOpenCourseScheduleSessionStatus ; diff --git a/web/src/main/java/com/ibeetl/jlw/service/TeacherOpenCourseScheduleSessionService.java b/web/src/main/java/com/ibeetl/jlw/service/TeacherOpenCourseScheduleSessionService.java index 456a54f3..f7a897b6 100644 --- a/web/src/main/java/com/ibeetl/jlw/service/TeacherOpenCourseScheduleSessionService.java +++ b/web/src/main/java/com/ibeetl/jlw/service/TeacherOpenCourseScheduleSessionService.java @@ -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' +d.teacherOpenCourseScheduleSessionStatusText + '' } }, @@ -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,