增加课程章节ID字段

doc/sql/mysql/tianze-pro-update.sql

@@ -491,3 +491,5 @@ DEFAULT CHARACTER SET = utf8
 COLLATE = utf8_general_ci;
 
 alter table question_log_summary comment '学生-题目日志-分析汇总';
+
+ALTER TABLE teacher_open_course_question_setting ADD COLUMN teacher_open_course_merge_course_info_id bigint(20) COMMENT '关联的章节ID（仅章节练习有值）';

web/src/main/java/com/ibeetl/jlw/entity/TeacherOpenCourseQuestionSetting.java

@@ -105,6 +105,10 @@ public class TeacherOpenCourseQuestionSetting extends BaseEntity {
     //创建时间
 
     private Date teacherOpenCourseQuestionSettingAddTime ;
+
+    //关联的章节ID（仅章节练习有值）
+
+    private Long teacherOpenCourseMergeCourseInfoId;
 	
     //组织ID
 

web/src/main/java/com/ibeetl/jlw/entity/dto/QuestionLogAddDTO.java

@@ -26,7 +26,7 @@ import static com.ibeetl.jlw.enums.QuestionLogAddTypeEnum.PRE_SUBMIT;
 public class QuestionLogAddDTO {
 
     /**
-     * 题目配置ID  简单理解，区分属于哪套卷子：章节测试、考试、作业 目前支持这三种类型。作业中，又区分题目作业，和附件作业。
+     * 题目配置ID  简单理解，区分属于哪套卷子：章节练习、考试、作业 目前支持这三种类型。作业中，又区分题目作业，和附件作业。
      */
     @NotNull(message = "题目配置ID")
     private Long questionSettingId;

web/src/main/java/com/ibeetl/jlw/service/GeneralQuestionLogService.java

@@ -855,7 +855,7 @@ public class GeneralQuestionLogService extends CoreBaseService<GeneralQuestionLo
         // generalQuestionSettingId：类似试卷ID，题目日志里会出现重复的试卷ID
         // 逻辑删除之前的题目日志，防止学生做题统计数据异常
         // 保证试卷是最新的
-        // 考试逻辑删除记录，作业或者章节测试都是直接删除记录。
+        // 考试逻辑删除记录，作业或者章节练习都是直接删除记录。
         // 强制发题
         if (isReSend) {
             logicDeleteBySettingIds(questionSettingId.toString());

web/src/main/java/com/ibeetl/jlw/service/TeacherOpenCourseMergeCourseInfoService.java

@@ -557,13 +557,13 @@ public class TeacherOpenCourseMergeCourseInfoService extends CoreBaseService<Tea
      * 处理一维集合，更换ID和父辈ID的方法
      *
      * @param copyToList        开课课程列表
-     * @param initcourseInfoIdPair        初始化的ID对
+     * @param initCourseInfoIdPair        初始化的ID对
      */
     public Map<Long, Long> batchUpdateArrayListSomeMergeId(List<TeacherOpenCourseMergeCourseInfo> copyToList,
                                                            // 不能为空，但是可以传递empty的Map
-                                                           @NotNull(message = "初始化ID对不能为空！") Map<Long, Long> initcourseInfoIdPair) {
+                                                           @NotNull(message = "初始化ID对不能为空！") Map<Long, Long> initCourseInfoIdPair) {
 
-        Map<Long, Long> courseInfoIdPair = new HashMap<>(initcourseInfoIdPair);
+        Map<Long, Long> courseInfoIdPair = new HashMap<>(initCourseInfoIdPair);
 
         // 查找列表中所有的ID
         Set<Long> mergeCourseInfoIdSet = copyToList.stream()

web/src/main/java/com/ibeetl/jlw/service/TeacherOpenCourseQuestionLogService.java

@@ -658,7 +658,7 @@ public class TeacherOpenCourseQuestionLogService extends CoreBaseService<Teacher
         // teacherOpenCourseQuestionSettingId：类似试卷ID，题目日志里会出现重复的试卷ID
         // 逻辑删除之前的题目日志，防止学生做题统计数据异常
         // 保证试卷是最新的
-        // 考试逻辑删除记录，作业或者章节测试都是直接删除记录。
+        // 考试逻辑删除记录，作业或者章节练习都是直接删除记录。
         // 强制发题
         if (isReSend) {
             logicDeleteBySettingIds(questionSettingId.toString());

web/src/main/java/com/ibeetl/jlw/service/TeacherOpenCourseQuestionSettingService.java

@@ -304,6 +304,8 @@ public class TeacherOpenCourseQuestionSettingService extends CoreBaseService<Tea
         // 设置章节练习的默认配置，并设置开课ID
         settingQuery.setChapterExerciseDefault().setTeacherOpenCourseId(teacherOpenCourseId);
         settingQuery.setTeacherOpenCourseQuestionSettingName(teacherOpenCourseMergeCourseInfoQuery.getCourseInfoName());
+        // 关联上课程章节ID，如果没有则会添加Null
+        settingQuery.setTeacherOpenCourseMergeCourseInfoId(teacherOpenCourseMergeCourseInfoQuery.getTeacherOpenCourseMergeCourseInfoId());
         settingQuery.setQuestionSettingOptions(new ArrayList<>(questionSettingOptions));
 
         switch (copyFrom) {

web/src/main/java/com/ibeetl/jlw/web/GeneralQuestionLogController.java

@@ -103,7 +103,7 @@ public class GeneralQuestionLogController extends BaseController {
     }
 
     /**
-     * 学生端-和题目有关的提交方法 （章节测试、考试、作业）
+     * 学生端-和题目有关的提交方法 （章节练习、考试、作业）
      * <li>支持附件上传 </li>
      *
      * @param questionLogAddDTO     提交的题目信息

web/src/main/java/com/ibeetl/jlw/web/TeacherOpenCourseQuestionLogController.java

@@ -110,7 +110,7 @@ public class TeacherOpenCourseQuestionLogController {
     }
 
     /**
-     * 学生端-和题目有关的提交方法 （章节测试、考试、作业）
+     * 学生端-和题目有关的提交方法 （章节练习、考试、作业）
      * <li>支持附件上传 </li>
      *
      * @param questionLogAddDTO     提交的题目信息

web/src/main/java/com/ibeetl/jlw/web/query/TeacherOpenCourseQuestionSettingQuery.java

@@ -70,6 +70,8 @@ public class TeacherOpenCourseQuestionSettingQuery extends PageParam {
     private Integer teacherOpenCourseQuestionSettingStatus;
     @Query(name = "创建时间", display = false)
     private Date teacherOpenCourseQuestionSettingAddTime;
+    @Query(name = "关联的章节ID（仅章节练习有值）", display = false)
+    private Long teacherOpenCourseMergeCourseInfoId;
     @Query(name = "组织ID", display = false)
     private Long orgId;
     @Query(name = "用户ID", display = false)

web/src/main/resources/sql/jlw/teacherOpenCourseQuestionSetting.md

@@ -73,6 +73,9 @@ queryByCondition
   @if(!isEmpty(teacherOpenCourseQuestionSettingRequire)){
   and t.teacher_open_course_question_setting_require =#teacherOpenCourseQuestionSettingRequire#
   @}
+  @if(!isEmpty(teacherOpenCourseMergeCourseInfoId)){
+  and t.teacher_open_course_merge_course_info_id =#teacherOpenCourseMergeCourseInfoId#
+  @}
   @if(!isEmpty(orgId)){
   and t.org_id =#orgId#
   @}
@@ -160,6 +163,9 @@ queryByConditionQuery
   @if(!isEmpty(teacherOpenCourseQuestionSettingRequire)){
   and t.teacher_open_course_question_setting_require =#teacherOpenCourseQuestionSettingRequire#
   @}
+  @if(!isEmpty(teacherOpenCourseMergeCourseInfoId)){
+  and t.teacher_open_course_merge_course_info_id =#teacherOpenCourseMergeCourseInfoId#
+  @}
   @if(!isEmpty(orgId)){
   and t.org_id =#orgId#
   @}
@@ -318,6 +324,13 @@ updateGivenByIds
   teacher_open_course_question_setting_require = #teacherOpenCourseQuestionSettingRequire# ,
   @}
   @}
+  @if(contain("teacherOpenCourseMergeCourseInfoId",_given)){
+  @if(isEmpty(teacherOpenCourseMergeCourseInfoId)){
+  teacher_open_course_merge_course_info_id = null ,
+  @}else{
+  teacher_open_course_merge_course_info_id = #teacherOpenCourseMergeCourseInfoId# ,
+  @}
+  @}
   @if(contain("orgId",_given)){
   @if(isEmpty(orgId)){
   org_id = null ,
@@ -398,6 +411,9 @@ getTeacherOpenCourseQuestionSettingValues
   @if(!isEmpty(teacherOpenCourseQuestionSettingRequire)){
   and t.teacher_open_course_question_setting_require =#teacherOpenCourseQuestionSettingRequire#
   @}
+  @if(!isEmpty(teacherOpenCourseMergeCourseInfoId)){
+  and t.teacher_open_course_merge_course_info_id =#teacherOpenCourseMergeCourseInfoId#
+  @}
   @if(!isEmpty(orgId)){
   and t.org_id =#orgId#
   @}
@@ -477,6 +493,9 @@ getValuesByQuery
   @if(!isEmpty(teacherOpenCourseQuestionSettingRequire)){
   and t.teacher_open_course_question_setting_require =#teacherOpenCourseQuestionSettingRequire#
   @}
+  @if(!isEmpty(teacherOpenCourseMergeCourseInfoId)){
+  and t.teacher_open_course_merge_course_info_id =#teacherOpenCourseMergeCourseInfoId#
+  @}
   @if(!isEmpty(orgId)){
   and t.org_id =#orgId#
   @}