From 2d4212570ff922355a0f63ebe741ac2032113813 Mon Sep 17 00:00:00 2001
From: Mlxa0324 <mlx950324@163.com>
Date: Tue, 15 Nov 2022 19:24:44 +0800
Subject: [PATCH] =?UTF-8?q?fix=20=E6=8E=92=E8=AF=BEBug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 doc/sql/mysql/tianze-pro.sql                              | 2 +-
 .../jlw/dao/TeacherOpenCourseScheduleSessionSnapDao.java  | 1 -
 .../jlw/entity/TeacherOpenCourseScheduleSession.java      | 2 +-
 .../service/TeacherOpenCourseScheduleSessionService.java  | 4 ++--
 .../web/query/TeacherOpenCourseScheduleSessionQuery.java  | 2 +-
 .../resources/sql/jlw/teacherOpenCourseScheduleSession.md | 3 ++-
 .../js/jlw/teacherOpenCourseScheduleSession/index.js      | 8 ++++----
 7 files changed, 11 insertions(+), 11 deletions(-)

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/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<Teac
         Collection<Object> 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..d3119b3d 100644
--- a/web/src/main/java/com/ibeetl/jlw/service/TeacherOpenCourseScheduleSessionService.java
+++ b/web/src/main/java/com/ibeetl/jlw/service/TeacherOpenCourseScheduleSessionService.java
@@ -130,6 +130,7 @@ public class TeacherOpenCourseScheduleSessionService extends CoreBaseService<Tea
     public void deleteTeacherOpenCourseScheduleSession(String ids){
         try {
             teacherOpenCourseScheduleSessionDao.deleteTeacherOpenCourseScheduleSessionByIds(ids);
+            teacherOpenCourseScheduleSessionSnapDao.deleteTeacherOpenCourseScheduleSessionBySessionIds(ids);
         } catch (Exception e) {
             throw new PlatformException("批量删除新增排课失败", e);
         }
@@ -395,8 +396,7 @@ public class TeacherOpenCourseScheduleSessionService extends CoreBaseService<Tea
         String teacherOpenCourseScheduleSessionId = teacherOpenCourseScheduleSessionOptions.getTeacherOpenCourseScheduleSessionId().toString();
 
         // 这里两张表 真删除
-        teacherOpenCourseScheduleSessionDao.deleteByIds(teacherOpenCourseScheduleSessionId);
-        teacherOpenCourseScheduleSessionSnapDao.deleteTeacherOpenCourseScheduleSessionBySessionIds(teacherOpenCourseScheduleSessionId);
+        deleteTeacherOpenCourseScheduleSession(teacherOpenCourseScheduleSessionId);
 
         // 排课记录表
         addSessionByOption(teacherOpenCourseScheduleSessionOptions);
diff --git a/web/src/main/java/com/ibeetl/jlw/web/query/TeacherOpenCourseScheduleSessionQuery.java b/web/src/main/java/com/ibeetl/jlw/web/query/TeacherOpenCourseScheduleSessionQuery.java
index 7dcc443b..c92cbd33 100644
--- a/web/src/main/java/com/ibeetl/jlw/web/query/TeacherOpenCourseScheduleSessionQuery.java
+++ b/web/src/main/java/com/ibeetl/jlw/web/query/TeacherOpenCourseScheduleSessionQuery.java
@@ -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_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;
diff --git a/web/src/main/resources/sql/jlw/teacherOpenCourseScheduleSession.md b/web/src/main/resources/sql/jlw/teacherOpenCourseScheduleSession.md
index 0ad8f992..a5e0f263 100644
--- a/web/src/main/resources/sql/jlw/teacherOpenCourseScheduleSession.md
+++ b/web/src/main/resources/sql/jlw/teacherOpenCourseScheduleSession.md
@@ -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,
diff --git a/web/src/main/resources/static/js/jlw/teacherOpenCourseScheduleSession/index.js b/web/src/main/resources/static/js/jlw/teacherOpenCourseScheduleSession/index.js
index 385ce9fe..f7ca6a3c 100644
--- a/web/src/main/resources/static/js/jlw/teacherOpenCourseScheduleSession/index.js
+++ b/web/src/main/resources/static/js/jlw/teacherOpenCourseScheduleSession/index.js
@@ -24,7 +24,7 @@ layui.define([ 'form', 'laydate', 'table' ,'laytpl'], function(exports) {
                 cellMinWidth: 100,
                 method : 'post',
                 // url : Common.ctxPath + '/jlw/teacherOpenCourseScheduleSession/list.json' // 数据接口
-                url : Common.ctxPath + '/jlw/teacherOpenCourseScheduleSession/listGroup.json?teacherOpenCourseScheduleSessionStatus=1' // 数据接口
+                url : Common.ctxPath + '/jlw/teacherOpenCourseScheduleSession/listGroup.json' // 数据接口
                 ,page : Lib.tablePage // 开启分页
                 /*,toolbar: '#toolbar_teacherOpenCourseScheduleSession' //自定义头部左侧工具栏
                 ,defaultToolbar: ['filter', 'print', 'exports'] //头部右侧工具栏*/
@@ -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>'
                         }
                     },
@@ -184,7 +184,7 @@ layui.define([ 'form', 'laydate', 'table' ,'laytpl'], function(exports) {
             } else if (obj.event == "enable") {
                 layer.confirm('是否确定启用该信息？', function (index) {
 
-                    var ret = Common.postAjax("/jlw/teacherOpenCourseScheduleSession/editSession.json",
+                    var ret = Common.postAjax("/jlw/teacherOpenCourseScheduleSession/edit.json",
                         {teacherOpenCourseScheduleSessionId: data.teacherOpenCourseScheduleSessionId,teacherOpenCourseScheduleSessionStatus:1});
                     layer.msg(ret.code == 0 ? "启用成功！" : ret.msg, {
                         offset: ['50%'],
@@ -198,7 +198,7 @@ layui.define([ 'form', 'laydate', 'table' ,'laytpl'], function(exports) {
                 });
             } else if (obj.event == "disable") {
                 layer.confirm('是否确定禁用该信息？', function (index) {
-                    var ret = Common.postAjax("/jlw/teacherOpenCourseScheduleSession/editSession.json",
+                    var ret = Common.postAjax("/jlw/teacherOpenCourseScheduleSession/edit.json",
                         {teacherOpenCourseScheduleSessionId: data.teacherOpenCourseScheduleSessionId,teacherOpenCourseScheduleSessionStatus:2});
                     layer.msg(ret.code == 0 ? "禁用成功！" : ret.msg, {
                         offset: ['50%'],