Merge remote-tracking branch 'origin/beetlsql3-dev' into beetlsql3-dev

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

@@ -309,16 +309,18 @@ public class TeacherOpenCourseMergeScheduleSessionService extends CoreBaseServic
      * 教师端-导入课程
      * @param teacherOpenCourseScheduleSessionIds   导入的排课IDs
      */
-    public void importScheduleSession(@NotEmpty(message = "排IDs不能为空！") String teacherOpenCourseScheduleSessionIds) {
+    public void importScheduleSession(@NotEmpty(message = "排IDs不能为空！") String teacherOpenCourseScheduleSessionIds,Long teacherOpenCourseId) {
 
         for (String id : teacherOpenCourseScheduleSessionIds.split(",")) {
             Long teacherOpenCourseScheduleSessionId = Long.valueOf(id);
+            //排课
             TeacherOpenCourseScheduleSession info = teacherOpenCourseScheduleSessionService.getInfo(teacherOpenCourseScheduleSessionId);
             // 先删除，再导入。支持导入重复数据，保证数据唯一
-            teacherOpenCourseMergeScheduleSessionDao.deleteByTeacherOpenCourseIdAndSessionId(info.getTeacherOpenCourseId(), teacherOpenCourseScheduleSessionId);
+            teacherOpenCourseMergeScheduleSessionDao.deleteByTeacherOpenCourseIdAndSessionId(teacherOpenCourseId, teacherOpenCourseScheduleSessionId);
 
             // 保存到关联表
             TeacherOpenCourseMergeScheduleSession scheduleSession = BeanUtil.copyProperties(info, TeacherOpenCourseMergeScheduleSession.class);
+            scheduleSession.setTeacherOpenCourseId(teacherOpenCourseId);
             scheduleSession.setTeacherOpenCourseMergeScheduleSessionStatus(1);
             scheduleSession.setTeacherOpenCourseMergeScheduleSessionAddTime(new Date());
             teacherOpenCourseMergeScheduleSessionDao.insert(scheduleSession);

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

@@ -122,8 +122,8 @@ public class TeacherOpenCourseMergeScheduleSessionController{
      * @return
      */
     @PostMapping(API + "/importScheduleSession.do")
-    public JsonResult importScheduleSessionDo(String teacherOpenCourseScheduleSessionIds){
-        teacherOpenCourseMergeScheduleSessionService.importScheduleSession(teacherOpenCourseScheduleSessionIds);
+    public JsonResult importScheduleSessionDo(String teacherOpenCourseScheduleSessionIds,Long teacherOpenCourseId){
+        teacherOpenCourseMergeScheduleSessionService.importScheduleSession(teacherOpenCourseScheduleSessionIds,teacherOpenCourseId);
         return JsonResult.success();
     }
 
@@ -449,8 +449,8 @@ public class TeacherOpenCourseMergeScheduleSessionController{
      */
     @PostMapping(MODEL + "/importScheduleSession.json")
     @Function("teacherOpenCourseMergeScheduleSession.edit")
-    public JsonResult importScheduleSession(String teacherOpenCourseScheduleSessionIds){
-        teacherOpenCourseMergeScheduleSessionService.importScheduleSession(teacherOpenCourseScheduleSessionIds);
+    public JsonResult importScheduleSession(String teacherOpenCourseScheduleSessionIds,Long teacherOpenCourseId){
+        teacherOpenCourseMergeScheduleSessionService.importScheduleSession(teacherOpenCourseScheduleSessionIds,teacherOpenCourseId);
         return JsonResult.success();
     }
 

web/src/main/resources/templates/jlw/courseInfo/examInfoList.html

@@ -383,10 +383,11 @@
                             ,
                             format: 'yyyy-MM-dd HH:mm:ss'
                         });
-                         generalQuestionSettingQuestionNoOrder = $("#addGeneral_demo input[name='generalQuestionSettingQuestionNoOrder']:checked").val();
-                         generalQuestionSettingOptionNoOrder = $("#addGeneral_demo input[name='generalQuestionSettingOptionNoOrder']:checked").val();
-                         generalQuestionSettingEndShowQa = $("#addGeneral_demo input[name='generalQuestionSettingEndShowQa']:checked").val();
-                         generalQuestionSettingEndShowTrueFalse = $("#addGeneral_demo input[name='generalQuestionSettingEndShowTrueFalse']:checked").val();
+                         generalQuestionSettingQuestionNoOrder = data.generalQuestionSettingQuestionNoOrder;
+                         generalQuestionSettingOptionNoOrder = data.generalQuestionSettingOptionNoOrder;
+                         generalQuestionSettingEndShowQa = data.generalQuestionSettingEndShowQa;
+                         generalQuestionSettingEndShowTrueFalse = data.generalQuestionSettingEndShowTrueFalse;
+
 
                     });
                     form.render();