From 5514ddd3ce59187295eb5237430c2c4ce957e42c Mon Sep 17 00:00:00 2001
From: Mlxa0324 <mlx950324@163.com>
Date: Mon, 14 Nov 2022 11:02:07 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E7=BC=96=E8=BE=91=EF=BC=8C?=
 =?UTF-8?q?=E9=A2=98=E7=9B=AE=E9=85=8D=E7=BD=AE=E4=B8=80=E4=B8=AA=E6=8E=A5?=
 =?UTF-8?q?=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../jlw/entity/TeacherOpenCourseMergeCourseInfo.java     | 6 +++++-
 .../service/TeacherOpenCourseQuestionSettingService.java | 9 +++++++++
 2 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/web/src/main/java/com/ibeetl/jlw/entity/TeacherOpenCourseMergeCourseInfo.java b/web/src/main/java/com/ibeetl/jlw/entity/TeacherOpenCourseMergeCourseInfo.java
index 7c17cdc5..a0738145 100644
--- a/web/src/main/java/com/ibeetl/jlw/entity/TeacherOpenCourseMergeCourseInfo.java
+++ b/web/src/main/java/com/ibeetl/jlw/entity/TeacherOpenCourseMergeCourseInfo.java
@@ -18,7 +18,7 @@ import java.util.List;
 */
 @Fetch
 @EqualsAndHashCode(callSuper=false)
-public class TeacherOpenCourseMergeCourseInfo extends BaseEntity {
+public class TeacherOpenCourseMergeCourseInfo extends BaseEntity implements Comparable<TeacherOpenCourseMergeCourseInfo> {
 
     //ID
     @NotNull(message = "ID不能为空", groups =ValidateConfig.UPDATE.class)
@@ -370,4 +370,8 @@ public class TeacherOpenCourseMergeCourseInfo extends BaseEntity {
         this.courseLabelIdText = courseLabelIdText;
     }
 
+    @Override
+    public int compareTo(TeacherOpenCourseMergeCourseInfo o) {
+        return this.getTeacherOpenCourseMergeCourseInfoId().compareTo(o.getTeacherOpenCourseMergeCourseInfoId());
+    }
 }
diff --git a/web/src/main/java/com/ibeetl/jlw/service/TeacherOpenCourseQuestionSettingService.java b/web/src/main/java/com/ibeetl/jlw/service/TeacherOpenCourseQuestionSettingService.java
index 43468548..624a1864 100644
--- a/web/src/main/java/com/ibeetl/jlw/service/TeacherOpenCourseQuestionSettingService.java
+++ b/web/src/main/java/com/ibeetl/jlw/service/TeacherOpenCourseQuestionSettingService.java
@@ -254,6 +254,15 @@ public class TeacherOpenCourseQuestionSettingService extends CoreBaseService<Tea
             settingQuery.setTeacherOpenCourseQuestionSettingPushStatus(1);
         }
 
+        // 编辑操作
+        if(ObjectUtil.isNotEmpty(settingQuery.getTeacherOpenCourseQuestionSettingId())) {
+            String editSettingIds = settingQuery.getTeacherOpenCourseQuestionSettingId().toString();
+            teacherOpenCourseQuestionSettingDao.deleteByIds(editSettingIds);
+            resourcesQuestionSnapshotService.deleteByTeacherOpenCourseQuestionSettingIds(editSettingIds);
+            // 删除主键，用于下面的保存方法
+            settingQuery.setTeacherOpenCourseQuestionSettingId(null);
+        }
+
         // 添加到作业主表中
         add(settingQuery);