From 3e13d1bb19dd9f5dd53962ca85de9bc7e42bde2c Mon Sep 17 00:00:00 2001
From: Mlxa0324 <mlx950324@163.com>
Date: Tue, 29 Nov 2022 00:09:26 +0800
Subject: [PATCH] =?UTF-8?q?=E9=80=BB=E8=BE=91=E5=88=A0=E9=99=A4=E9=A2=98?=
 =?UTF-8?q?=E7=9B=AE=E6=97=A5=E5=BF=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/ibeetl/jlw/service/GeneralQuestionLogService.java    | 5 +----
 .../jlw/service/TeacherOpenCourseQuestionLogService.java     | 5 +----
 .../main/resources/sql/jlw/teacherOpenCourseQuestionLog.md   | 2 +-
 3 files changed, 3 insertions(+), 9 deletions(-)

diff --git a/web/src/main/java/com/ibeetl/jlw/service/GeneralQuestionLogService.java b/web/src/main/java/com/ibeetl/jlw/service/GeneralQuestionLogService.java
index a1d31063..23c23c23 100644
--- a/web/src/main/java/com/ibeetl/jlw/service/GeneralQuestionLogService.java
+++ b/web/src/main/java/com/ibeetl/jlw/service/GeneralQuestionLogService.java
@@ -54,7 +54,6 @@ import static cn.jlw.util.CacheUserUtil.getStudent;
 import static com.ibeetl.admin.core.util.ExcelUtil.getCellFormatValue;
 import static com.ibeetl.jlw.enums.QuestionLogAddTypeEnum.PRE_SUBMIT;
 import static com.ibeetl.jlw.enums.ResourcesQuestionSnapshotFromTypeEnum.CHAPTER_EXERCISE;
-import static com.ibeetl.jlw.enums.ResourcesQuestionSnapshotFromTypeEnum.EXAM;
 import static java.util.stream.Collectors.groupingBy;
 
 /**
@@ -648,9 +647,7 @@ public class GeneralQuestionLogService extends CoreBaseService<GeneralQuestionLo
         Long teacherOpenCourseQuestionSettingId = setting.getGeneralQuestionSettingId();
         // 强制发题
         if (isReSend) {
-            if (setting.getGeneralQuestionSettingType().equals(EXAM)) {
-                logicDeleteBySettingIds(teacherOpenCourseQuestionSettingId.toString());
-            }
+            logicDeleteBySettingIds(teacherOpenCourseQuestionSettingId.toString());
         }
 
         // 断言
diff --git a/web/src/main/java/com/ibeetl/jlw/service/TeacherOpenCourseQuestionLogService.java b/web/src/main/java/com/ibeetl/jlw/service/TeacherOpenCourseQuestionLogService.java
index 759c7440..be13c8e3 100644
--- a/web/src/main/java/com/ibeetl/jlw/service/TeacherOpenCourseQuestionLogService.java
+++ b/web/src/main/java/com/ibeetl/jlw/service/TeacherOpenCourseQuestionLogService.java
@@ -50,7 +50,6 @@ import static com.ibeetl.admin.core.util.user.CacheUserUtil.getUserId;
 import static com.ibeetl.jlw.enums.QuestionLogAddTypeEnum.FINALLY_SUBMIT;
 import static com.ibeetl.jlw.enums.QuestionLogAddTypeEnum.PRE_SUBMIT;
 import static com.ibeetl.jlw.enums.ResourcesQuestionSnapshotFromTypeEnum.CHAPTER_EXERCISE;
-import static com.ibeetl.jlw.enums.ResourcesQuestionSnapshotFromTypeEnum.EXAM;
 import static java.util.stream.Collectors.groupingBy;
 
 /**
@@ -461,9 +460,7 @@ public class TeacherOpenCourseQuestionLogService extends CoreBaseService<Teacher
         Long teacherOpenCourseQuestionSettingId = setting.getTeacherOpenCourseQuestionSettingId();
         // 强制发题
         if (isReSend) {
-            if (setting.getTeacherOpenCourseQuestionSettingType().equals(EXAM)) {
-                logicDeleteBySettingIds(teacherOpenCourseQuestionSettingId.toString());
-            }
+            logicDeleteBySettingIds(teacherOpenCourseQuestionSettingId.toString());
         }
 
         // 断言
diff --git a/web/src/main/resources/sql/jlw/teacherOpenCourseQuestionLog.md b/web/src/main/resources/sql/jlw/teacherOpenCourseQuestionLog.md
index 607f0051..c7e2432a 100644
--- a/web/src/main/resources/sql/jlw/teacherOpenCourseQuestionLog.md
+++ b/web/src/main/resources/sql/jlw/teacherOpenCourseQuestionLog.md
@@ -360,7 +360,7 @@ logicDeleteBySettingIds
 
 * 根据题目配置ID批量删除（假删除）
 
-  update teacher_open_course_question_log set teacher_open_course_question_log_status = 2 where find_in_set(teacher_open_course_question_setting_id, settingIds#)
+  update teacher_open_course_question_log set teacher_open_course_question_log_status = 2 where find_in_set(teacher_open_course_question_setting_id, #settingIds#)
 
 
 deleteByIds