Merge remote-tracking branch 'origin/master_saas' into master_saas

# Conflicts:
#	mec-biz/src/main/java/com/ym/mec/biz/service/impl/CourseScheduleServiceImpl.java
#	mec-web/src/main/java/com/ym/mec/web/controller/CourseScheduleController.java

.idea/httpRequests/http-requests-log.http

@@ -1,620 +1,871 @@
-GET http://127.0.0.1:9002/teacherCourseSchedule/liveCourseScheduleTime?courseScheduleId=2548
-Authorization: bearer e70c68c9-05e3-4502-aed4-f7001a0e2766
-Proxy-Connection: Keep-Alive
+GET http://127.0.0.1:9002/extracurricularExercises/queryTeacherServeHomeworkDetail/v2?startTime=2023-04-10&endTime=2023-06-16&type=HOMEWORK&classType=&homeWorkStatus=&page=1&rows=20&musicGroupId=
+Authorization: bearer 139a014d-1193-419b-82ff-823d0ad9b154
+Connection: Keep-Alive
 User-Agent: Apache-HttpClient/4.5.14 (Java/17.0.6)
 Accept-Encoding: br,deflate,gzip,x-gzip
 
-<> 2023-06-15T221721.200.json
+<> 2023-06-16T133204.200.json
 
 ###
 
-GET http://127.0.0.1:9002/teacherCourseSchedule/liveCourseScheduleTime?courseScheduleId=2548
-Authorization: bearer e70c68c9-05e3-4502-aed4-f7001a0e2766
-Proxy-Connection: Keep-Alive
+GET http://127.0.0.1:9002/extracurricularExercises/queryTeacherServeHomeworkDetail/v2?startTime=2023-04-10&endTime=2023-06-16&type=HOMEWORK&classType=&homeWorkStatus=&page=1&rows=20&musicGroupId=
+Authorization: bearer 379bbe77-8542-4a58-9453-9a0b20b680fe
+Connection: Keep-Alive
 User-Agent: Apache-HttpClient/4.5.14 (Java/17.0.6)
 Accept-Encoding: br,deflate,gzip,x-gzip
 
-<> 2023-06-15T221523.200.json
+<> 2023-06-16T133119.200.json
 
 ###
 
-GET http://127.0.0.1:9002/teacherCourseSchedule/liveCourseScheduleTime?courseScheduleId=2548
-Authorization: bearer e70c68c9-05e3-4502-aed4-f7001a0e2766
-Proxy-Connection: Keep-Alive
+GET http://127.0.0.1:9002/extracurricularExercises/queryTeacherServeHomeworkDetail/v2?startTime=2023-04-10&endTime=2023-06-16&type=HOMEWORK&classType=&homeWorkStatus=&page=1&rows=20&musicGroupId=
+Authorization: bearer 379bbe77-8542-4a58-9453-9a0b20b680fe
+Connection: Keep-Alive
 User-Agent: Apache-HttpClient/4.5.14 (Java/17.0.6)
 Accept-Encoding: br,deflate,gzip,x-gzip
 
-<> 2023-06-15T221236.200.json
+<> 2023-06-16T120034.200.json
 
 ###
 
-GET http://127.0.0.1:9002/teacherCourseSchedule/liveCourseScheduleTime?courseScheduleId=2548
-Authorization: bearer e70c68c9-05e3-4502-aed4-f7001a0e2766
-Proxy-Connection: Keep-Alive
+GET http://127.0.0.1:9002/extracurricularExercises/queryTeacherServeHomeworkDetail/v2?startTime=2023-04-10&endTime=2023-06-16&type=HOMEWORK&classType=&homeWorkStatus=&page=1&rows=20&musicGroupId=
+Authorization: bearer 379bbe77-8542-4a58-9453-9a0b20b680fe
+Connection: Keep-Alive
 User-Agent: Apache-HttpClient/4.5.14 (Java/17.0.6)
 Accept-Encoding: br,deflate,gzip,x-gzip
 
-<> 2023-06-15T220649.200.json
+<> 2023-06-16T115953.200.json
 
 ###
 
-GET http://127.0.0.1:9002/teacherCourseSchedule/getCourseSchedulesWithDate?date=2023-06-05 00:00:00
-Content-Type: application/json
-Authorization: bearer 4d8e23a1-3acd-42e4-a1ca-b4d595506d98
-Proxy-Connection: Keep-Alive
+GET http://127.0.0.1:9002/extracurricularExercises/queryTeacherServeHomeworkDetail/v2?startTime=2023-04-10&endTime=2023-06-16&type=HOMEWORK&classType=&homeWorkStatus=&page=1&rows=20&musicGroupId=
+Authorization: bearer c40a7231-5cfd-4495-ac88-bced0c9aa0cc
+Connection: Keep-Alive
 User-Agent: Apache-HttpClient/4.5.14 (Java/17.0.6)
 Accept-Encoding: br,deflate,gzip,x-gzip
 
-<> 2023-06-15T220555.200.json
+<> 2023-06-16T115703.200.json
 
 ###
 
-GET http://127.0.0.1:9002/teacherCourseSchedule/liveCourseScheduleTime?courseScheduleId=2548
-Authorization: bearer e70c68c9-05e3-4502-aed4-f7001a0e2766
-Proxy-Connection: Keep-Alive
+POST http://127.0.0.1:9002/teacherAttendance/add
+authorization: bearer 1a9dbd9c-b150-4461-bce9-0f6b082dd708
+Content-Type: application/json
+Content-Length: 2334
+Connection: Keep-Alive
 User-Agent: Apache-HttpClient/4.5.14 (Java/17.0.6)
 Accept-Encoding: br,deflate,gzip,x-gzip
 
-<> 2023-06-15T220546.200.json
+{
+  "studentStandardDtos" : [
+    {
+      "qualifiedFlag" : 1,
+      "userId" : "2248984",
+      "repairFlag" : false
+    },
+    {
+      "qualifiedFlag" : 1,
+      "userId" : "2249113",
+      "repairFlag" : false
+    }
+  ],
+  "teacherAttendanceInfo" : {
+    "status" : "1",
+    "signOutLongitudeLatitude" : "114.344874,30.555084",
+    "courseScheduleId" : "2469",
+    "update" : "0",
+    "deviceNum" : "",
+    "signOutRemark" : "好"
+  },
+  "courseHomeworkInfo" : {
+    "lessonExaminationSaveDto" : {
+      "studentLessonExaminationSaveDtos" : [
+        {
+          "group" : "1",
+          "subjectId" : "23",
+          "musicScoreHomeworkDtoList" : [
+            {
+              "musicScoreId" : "1177",
+              "partIndex" : "0"
+            },
+            {
+              "musicScoreId" : "12081",
+              "partIndex" : "0"
+            }
+          ],
+          "musicScoreIdList" : [
+            "1177",
+            "12081"
+          ],
+          "userIdList" : [
+            "2248984"
+          ],
+          "examinationDetailDtos" : [
+            {
+              "musicScoreId" : "1177",
+              "heardLevel" : "ADVANCED",
+              "partIndex" : "0",
+              "score" : 60
+            },
+            {
+              "musicScoreId" : "12081",
+              "heardLevel" : "ADVANCED",
+              "partIndex" : "0",
+              "score" : 70
+            }
+          ]
+        },
+        {
+          "group" : "2",
+          "subjectId" : "23",
+          "musicScoreHomeworkDtoList" : [
+            {
+              "musicScoreId" : "1181",
+              "partIndex" : "0"
+            }
+          ],
+          "musicScoreIdList" : [
+            "1181"
+          ],
+          "userIdList" : [
+            "2249113"
+          ],
+          "examinationDetailDtos" : [
+            {
+              "musicScoreId" : "1181",
+              "heardLevel" : "BEGINNER",
+              "partIndex" : "0",
+              "score" : 60
+            }
+          ]
+        }
+      ],
+      "teacherId" : "2248323",
+      "courseScheduleId" : "2469",
+      "expectNum" : 2,
+      "classGroupId" : "397"
+    },
+    "title" : "",
+    "content" : "",
+    "courseScheduleId" : "2469",
+    "attachments" : "https:\/\/daya.ks3-cn-beijing.ksyuncs.com\/202306\/16\/MTY4Njg4NjAzMjQ1MzQ1NTAwMDAwMA==_2248323classFinishImg.jpeg"
+  }
+}
+
+<> 2023-06-16T113253.200.json
 
 ###
 
-GET http://127.0.0.1:9002/teacherCourseSchedule/liveCourseScheduleTime?courseScheduleId=2548
-Authorization: bearer e70c68c9-05e3-4502-aed4-f7001a0e2766
-Proxy-Connection: Keep-Alive
+POST http://127.0.0.1:9002/teacherAttendance/add
+authorization: bearer cf400ae3-f2b5-40b3-8d7f-7c2d073666ad
+Content-Type: application/json
+Content-Length: 2334
+Connection: Keep-Alive
 User-Agent: Apache-HttpClient/4.5.14 (Java/17.0.6)
 Accept-Encoding: br,deflate,gzip,x-gzip
 
-<> 2023-06-15T220439.200.json
+{
+  "studentStandardDtos" : [
+    {
+      "qualifiedFlag" : 1,
+      "userId" : "2248984",
+      "repairFlag" : false
+    },
+    {
+      "qualifiedFlag" : 1,
+      "userId" : "2249113",
+      "repairFlag" : false
+    }
+  ],
+  "teacherAttendanceInfo" : {
+    "status" : "1",
+    "signOutLongitudeLatitude" : "114.344874,30.555084",
+    "courseScheduleId" : "2469",
+    "update" : "0",
+    "deviceNum" : "",
+    "signOutRemark" : "好"
+  },
+  "courseHomeworkInfo" : {
+    "lessonExaminationSaveDto" : {
+      "studentLessonExaminationSaveDtos" : [
+        {
+          "group" : "1",
+          "subjectId" : "23",
+          "musicScoreHomeworkDtoList" : [
+            {
+              "musicScoreId" : "1177",
+              "partIndex" : "0"
+            },
+            {
+              "musicScoreId" : "12081",
+              "partIndex" : "0"
+            }
+          ],
+          "musicScoreIdList" : [
+            "1177",
+            "12081"
+          ],
+          "userIdList" : [
+            "2248984"
+          ],
+          "examinationDetailDtos" : [
+            {
+              "musicScoreId" : "1177",
+              "heardLevel" : "ADVANCED",
+              "partIndex" : "0",
+              "score" : 60
+            },
+            {
+              "musicScoreId" : "12081",
+              "heardLevel" : "ADVANCED",
+              "partIndex" : "0",
+              "score" : 70
+            }
+          ]
+        },
+        {
+          "group" : "2",
+          "subjectId" : "23",
+          "musicScoreHomeworkDtoList" : [
+            {
+              "musicScoreId" : "1181",
+              "partIndex" : "0"
+            }
+          ],
+          "musicScoreIdList" : [
+            "1181"
+          ],
+          "userIdList" : [
+            "2249113"
+          ],
+          "examinationDetailDtos" : [
+            {
+              "musicScoreId" : "1181",
+              "heardLevel" : "BEGINNER",
+              "partIndex" : "0",
+              "score" : 60
+            }
+          ]
+        }
+      ],
+      "teacherId" : "2248323",
+      "courseScheduleId" : "2469",
+      "expectNum" : 2,
+      "classGroupId" : "397"
+    },
+    "title" : "",
+    "content" : "",
+    "courseScheduleId" : "2469",
+    "attachments" : "https:\/\/daya.ks3-cn-beijing.ksyuncs.com\/202306\/16\/MTY4Njg4NjAzMjQ1MzQ1NTAwMDAwMA==_2248323classFinishImg.jpeg"
+  }
+}
+
+<> 2023-06-16T113219.200.json
 
 ###
 
-GET http://127.0.0.1:9002/teacherCourseSchedule/liveCourseScheduleTime?courseScheduleId=2548
-Authorization: bearer e70c68c9-05e3-4502-aed4-f7001a0e2766
-Proxy-Connection: Keep-Alive
+GET http://localhost:8002/api/v1/work-order/checkTlpUpdate?workInfoId=1
+Authorization: Bearer 4261d745-d23d-4999-9591-a615fc758e49
+Connection: Keep-Alive
 User-Agent: Apache-HttpClient/4.5.14 (Java/17.0.6)
 Accept-Encoding: br,deflate,gzip,x-gzip
 
-<> 2023-06-15T220236.200.json
+<> 2023-06-14T213615.200.json
 
 ###
 
-GET http://127.0.0.1:9002/teacherCourseSchedule/liveCourseScheduleTime?courseScheduleId=2548
-Authorization: bearer e70c68c9-05e3-4502-aed4-f7001a0e2766
-Proxy-Connection: Keep-Alive
+GET http://localhost:8002/api/v1/work-order/checkTlpUpdate?workInfoId=1
+Authorization: Bearer 4261d745-d23d-4999-9591-a615fc758e49
+Connection: Keep-Alive
 User-Agent: Apache-HttpClient/4.5.14 (Java/17.0.6)
 Accept-Encoding: br,deflate,gzip,x-gzip
 
-<> 2023-06-15T215903.200.json
+<> 2023-06-14T213539.200.json
 
 ###
 
-GET http://127.0.0.1:9002/teacherCourseSchedule/liveCourseScheduleTime?courseScheduleId=2548
-Authorization: bearer e70c68c9-05e3-4502-aed4-f7001a0e2766
-Proxy-Connection: Keep-Alive
+GET http://localhost:8002/api/v1/work-order/checkTlpUpdate?workInfoId=1
+Authorization: Bearer 4261d745-d23d-4999-9591-a615fc758e49
+Connection: Keep-Alive
 User-Agent: Apache-HttpClient/4.5.14 (Java/17.0.6)
 Accept-Encoding: br,deflate,gzip,x-gzip
 
-<> 2023-06-15T215426.200.json
+<> 2023-06-14T213447.200.json
 
 ###
 
-GET http://127.0.0.1:9002/teacherCourseSchedule/liveCourseScheduleTime?courseScheduleId=2548
-Authorization: bearer e70c68c9-05e3-4502-aed4-f7001a0e2766
-Proxy-Connection: Keep-Alive
+GET http://localhost:8002/api/v1/work-order/checkTlpUpdate?workInfoId=1
+Authorization: Bearer 4261d745-d23d-4999-9591-a615fc758e49
+Connection: Keep-Alive
 User-Agent: Apache-HttpClient/4.5.14 (Java/17.0.6)
 Accept-Encoding: br,deflate,gzip,x-gzip
 
-<> 2023-06-15T215131.200.json
+<> 2023-06-14T213333.200.json
 
 ###
 
-POST https://online.lexiaoya.cn/api-backend/open/schoolTeacherStudent/importPlan?fileUrl=https://polestar-oss.oss-cn-shenzhen.aliyuncs.com/assets/excel/0614/0614单簧管导入表.xlsx
-Content-Length: 0
+GET http://localhost:8002/api/v1/work-order/checkTlpUpdate?workInfoId=1
+Authorization: Bearer b2d082f2-2e51-4880-8119-5471c5287bf9
 Connection: Keep-Alive
 User-Agent: Apache-HttpClient/4.5.14 (Java/17.0.6)
 Accept-Encoding: br,deflate,gzip,x-gzip
 
-<> 2023-06-15T100514.200.json
+<> 2023-06-14T213013.200.json
 
 ###
 
-POST http://127.0.0.1:9002/teacherCourseSchedule/liveCoursePage
-authorization: bearer 0071d90f-5623-4ee9-a88e-c7adb09efb1c
-Content-Type: application/json
-Content-Length: 149
+GET http://localhost:8002/api/v1/work-order/checkTlpUpdate?workInfoId=1
+Authorization: Bearer b2d082f2-2e51-4880-8119-5471c5287bf9
 Connection: Keep-Alive
 User-Agent: Apache-HttpClient/4.5.14 (Java/17.0.6)
 Accept-Encoding: br,deflate,gzip,x-gzip
 
-{
-  "page": 1,
-  "rows": 10,
-//  "startTime": "2023-06-06 10:14:57",
-//  "endTime": "2023-06-08 10:14:57",
-//  "search": "",
-  "status": "UNDERWAY"
-}
-
-<> 2023-06-14T173156.200.json
+<> 2023-06-14T212934.200.json
 
 ###
 
-POST http://127.0.0.1:9002/teacherCourseSchedule/liveCoursePage
-authorization: bearer 0071d90f-5623-4ee9-a88e-c7adb09efb1c
-Content-Type: application/json
-Content-Length: 150
+GET http://localhost:8002/api/v1/work-order/checkTlpUpdate?workInfoId=1
+Authorization: Bearer b2d082f2-2e51-4880-8119-5471c5287bf9
 Connection: Keep-Alive
 User-Agent: Apache-HttpClient/4.5.14 (Java/17.0.6)
 Accept-Encoding: br,deflate,gzip,x-gzip
 
-{
-  "page": 1,
-  "rows": 10,
-//  "startTime": "2023-06-06 10:14:57",
-//  "endTime": "2023-06-08 10:14:57",
-//  "search": "",
-  "status": "NOT_START"
-}
-
-<> 2023-06-14T173111.200.json
+<> 2023-06-14T212932.200.json
 
 ###
 
-POST http://127.0.0.1:9002/teacherCourseSchedule/liveCoursePage
-authorization: bearer a9b023c1-f525-4b95-8723-0ca14b038624
-Content-Type: application/json
-Content-Length: 150
+GET http://localhost:8002/api/v1/work-order/checkTlpUpdate?workInfoId=1
+Authorization: Bearer b2d082f2-2e51-4880-8119-5471c5287bf9
 Connection: Keep-Alive
 User-Agent: Apache-HttpClient/4.5.14 (Java/17.0.6)
 Accept-Encoding: br,deflate,gzip,x-gzip
 
-{
-  "page": 1,
-  "rows": 10,
-//  "startTime": "2023-06-06 10:14:57",
-//  "endTime": "2023-06-08 10:14:57",
-//  "search": "",
-  "status": "NOT_START"
-}
-
-<> 2023-06-14T173045.200.json
+<> 2023-06-14T212928.200.json
 
 ###
 
-GET http://127.0.0.1:9001/studentCourseSchedule/queryCourseId?courseId=2162
-Authorization: bearer b2d082f2-2e51-4880-8119-5471c5287bf9
+GET http://localhost:8002/api/v1/work-order/checkTlpUpdate?workInfoId=1
+Authorization: Bearer b2d082f2-2e51-4880-8119-5471c5287bf9
 Connection: Keep-Alive
 User-Agent: Apache-HttpClient/4.5.14 (Java/17.0.6)
 Accept-Encoding: br,deflate,gzip,x-gzip
 
-<> 2023-06-14T154028.200.json
+<> 2023-06-14T212634.200.json
 
 ###
 
-GET http://127.0.0.1:9001/studentCourseSchedule/queryCourseId?courseId=2162
-Authorization: bearer b2d082f2-2e51-4880-8119-5471c5287bf9
+GET http://localhost:8002/api/v1/work-order/checkTlpUpdate?workInfoId=1
 Connection: Keep-Alive
 User-Agent: Apache-HttpClient/4.5.14 (Java/17.0.6)
 Accept-Encoding: br,deflate,gzip,x-gzip
 
-<> 2023-06-14T145629.200.json
+<> 2023-06-14T212541.200.json
 
 ###
 
-GET http://127.0.0.1:9001/studentCourseSchedule/queryCourseId?courseId=1374
-Authorization: bearer b2d082f2-2e51-4880-8119-5471c5287bf9
+GET http://localhost:8002/v1/work-order/checkTlpUpdate?workInfoId=1
 Connection: Keep-Alive
 User-Agent: Apache-HttpClient/4.5.14 (Java/17.0.6)
 Accept-Encoding: br,deflate,gzip,x-gzip
 
-<> 2023-06-14T145450.200.json
+<> 2023-06-14T212528.404.txt
 
 ###
 
-GET http://127.0.0.1:8005/courseSchedule/getCurrentCourseDetail/1374
-Authorization: bearer b2d082f2-2e51-4880-8119-5471c5287bf9
+GET http://localhost:8002/work-order/checkTlpUpdate?workInfoId=1
 Connection: Keep-Alive
 User-Agent: Apache-HttpClient/4.5.14 (Java/17.0.6)
 Accept-Encoding: br,deflate,gzip,x-gzip
 
-<> 2023-06-14T143343.200.json
+<> 2023-06-14T212513.404.txt
 
 ###
 
-GET http://127.0.0.1:8005/courseSchedule/query?courseScheduleId=1374
-Authorization: bearer b2d082f2-2e51-4880-8119-5471c5287bf9
+POST http://127.0.0.1:9002/courseHomework/findCourseStudentsPublicSubject/v2
+authorization: bearer b2d082f2-2e51-4880-8119-5471c5287bf9
+Content-Type: application/json
+Content-Length: 87
 Connection: Keep-Alive
 User-Agent: Apache-HttpClient/4.5.14 (Java/17.0.6)
 Accept-Encoding: br,deflate,gzip,x-gzip
 
-<> 2023-06-14T143049.200.json
+{
+  "courseScheduleId": "912",
+  "type": "HOMEWORK",
+  "search": "",
+  "subjectId": 4
+}
+
+<> 2023-06-14T184909.200.json
 
 ###
 
-POST http://127.0.0.1:9002/teacherAttendance/getLiveCurrentCourseStudents
+POST http://127.0.0.1:9002/courseHomework/findHomeworkGroupInfo
 authorization: bearer b2d082f2-2e51-4880-8119-5471c5287bf9
 Content-Type: application/json
-Content-Length: 69
+Content-Length: 110
 Connection: Keep-Alive
 User-Agent: Apache-HttpClient/4.5.14 (Java/17.0.6)
 Accept-Encoding: br,deflate,gzip,x-gzip
 
 {
-  "courseScheduleId": "2328",
-  "status": "SHARE",
-  "search": ""
+  "courseScheduleId": "912",
+  "type": "HOMEWORK",
+  "group": 2,
+  "search": "",
+  "page": 1,
+  "rows": 10
 }
 
-<> 2023-06-14T124937.200.json
+<> 2023-06-14T184708.200.json
 
 ###
 
-POST http://127.0.0.1:9002/teacherAttendance/getLiveCurrentCourseStudents
+POST http://127.0.0.1:9002/courseHomework/findHomeworkGroupInfo
 authorization: bearer b2d082f2-2e51-4880-8119-5471c5287bf9
 Content-Type: application/json
-Content-Length: 69
+Content-Length: 110
 Connection: Keep-Alive
 User-Agent: Apache-HttpClient/4.5.14 (Java/17.0.6)
 Accept-Encoding: br,deflate,gzip,x-gzip
 
 {
-  "courseScheduleId": "2328",
-  "status": "SHARE",
-  "search": ""
+  "courseScheduleId": "912",
+  "type": "HOMEWORK",
+  "group": 2,
+  "search": "",
+  "page": 1,
+  "rows": 10
 }
 
-<> 2023-06-14T124615.200.json
+<> 2023-06-14T183634.200.json
 
 ###
 
-POST http://127.0.0.1:9002/teacherAttendance/getLiveCurrentCourseStudents
+POST http://127.0.0.1:9002/courseHomework/findHomeworkGroupInfo
 authorization: bearer b2d082f2-2e51-4880-8119-5471c5287bf9
 Content-Type: application/json
-Content-Length: 69
+Content-Length: 110
 Connection: Keep-Alive
 User-Agent: Apache-HttpClient/4.5.14 (Java/17.0.6)
 Accept-Encoding: br,deflate,gzip,x-gzip
 
 {
-  "courseScheduleId": "2328",
-  "status": "SHARE",
-  "search": ""
+  "courseScheduleId": "912",
+  "type": "HOMEWORK",
+  "group": 2,
+  "search": "",
+  "page": 1,
+  "rows": 10
 }
 
-<> 2023-06-14T124548.200.json
+<> 2023-06-14T183547.200.json
 
 ###
 
-POST http://127.0.0.1:9002/teacherAttendance/getLiveCurrentCourseStudents
+POST http://127.0.0.1:9002/courseHomework/findCourseStudentsPublicSubject/v2
 authorization: bearer b2d082f2-2e51-4880-8119-5471c5287bf9
 Content-Type: application/json
-Content-Length: 69
+Content-Length: 114
 Connection: Keep-Alive
 User-Agent: Apache-HttpClient/4.5.14 (Java/17.0.6)
 Accept-Encoding: br,deflate,gzip,x-gzip
 
 {
-  "courseScheduleId": "2328",
-  "status": "SHARE",
-  "search": ""
+  "courseScheduleId": "912",
+  "type": "HOMEWORK",
+  "search": "",
+  "subjectId": 4,
+  "page": 1,
+  "rows": 10
 }
 
-<> 2023-06-14T124526.200.json
+<> 2023-06-14T175934.200.json
 
 ###
 
-POST http://127.0.0.1:9002/teacherAttendance/getLiveCurrentCourseStudents
+POST http://127.0.0.1:9002/courseHomework/findCourseStudentsPublicSubject/v2
 authorization: bearer b2d082f2-2e51-4880-8119-5471c5287bf9
 Content-Type: application/json
-Content-Length: 69
+Content-Length: 116
 Connection: Keep-Alive
 User-Agent: Apache-HttpClient/4.5.14 (Java/17.0.6)
 Accept-Encoding: br,deflate,gzip,x-gzip
 
 {
-  "courseScheduleId": "2328",
-  "status": "SHARE",
-  "search": ""
+  "courseScheduleId": "912",
+  "type": "HOMEWORK",
+  "search": "",
+//  "subjectId": 5,
+  "page": 1,
+  "rows": 10
 }
 
-<> 2023-06-14T124513.200.json
+<> 2023-06-14T175915.200.json
 
 ###
 
-POST http://127.0.0.1:9002/teacherAttendance/getLiveCurrentCourseStudents
+POST http://127.0.0.1:9002/courseHomework/findCourseStudentsPublicSubject/v2
 authorization: bearer b2d082f2-2e51-4880-8119-5471c5287bf9
 Content-Type: application/json
-Content-Length: 69
+Content-Length: 116
 Connection: Keep-Alive
 User-Agent: Apache-HttpClient/4.5.14 (Java/17.0.6)
 Accept-Encoding: br,deflate,gzip,x-gzip
 
 {
-  "courseScheduleId": "2328",
-  "status": "SHARE",
-  "search": ""
+  "courseScheduleId": "912",
+  "type": "HOMEWORK",
+  "search": "",
+//  "subjectId": 5,
+  "page": 1,
+  "rows": 10
 }
 
-<> 2023-06-14T124441.200.json
+<> 2023-06-14T175818.200.json
 
 ###
 
-POST http://127.0.0.1:9002/teacherCourseSchedule/liveCoursePage
-authorization: bearer a9b023c1-f525-4b95-8723-0ca14b038624
+POST http://127.0.0.1:9002/courseHomework/findCourseStudentsPublicSubject/v2
+authorization: bearer b2d082f2-2e51-4880-8119-5471c5287bf9
 Content-Type: application/json
-Content-Length: 152
+Content-Length: 114
 Connection: Keep-Alive
 User-Agent: Apache-HttpClient/4.5.14 (Java/17.0.6)
 Accept-Encoding: br,deflate,gzip,x-gzip
 
 {
+  "courseScheduleId": "912",
+  "type": "HOMEWORK",
+  "search": "",
+  "subjectId": 5,
   "page": 1,
-  "rows": 10,
-//  "startTime": "2023-06-06 10:14:57",
-//  "endTime": "2023-06-08 10:14:57",
-//  "search": "",
-//  "status": "NOT_START"
+  "rows": 10
 }
 
-<> 2023-06-14T111123.200.json
+<> 2023-06-14T175509.200.json
 
 ###
 
-POST http://127.0.0.1:8005/vipGroupManage/liveStudentList
-Authorization: bearer b2d082f2-2e51-4880-8119-5471c5287bf9
+POST http://127.0.0.1:9002/courseHomework/findCourseStudentsPublicSubject/v2
+authorization: bearer b2d082f2-2e51-4880-8119-5471c5287bf9
 Content-Type: application/json
-Content-Length: 78
+Content-Length: 114
 Connection: Keep-Alive
 User-Agent: Apache-HttpClient/4.5.14 (Java/17.0.6)
 Accept-Encoding: br,deflate,gzip,x-gzip
 
 {
+  "courseScheduleId": "912",
+  "type": "HOMEWORK",
+  "search": "",
+  "subjectId": 5,
   "page": 1,
-  "rows": 10,
-  "liveGroupId": 102,
-  "search": "测试59611"
+  "rows": 10
 }
 
-<> 2023-06-14T105403.200.json
+<> 2023-06-14T175219.200.json
 
 ###
 
-POST http://127.0.0.1:8005/vipGroupManage/liveStudentList
-Authorization: bearer b2d082f2-2e51-4880-8119-5471c5287bf9
+POST http://127.0.0.1:9002/courseHomework/findCourseStudentsPublicSubject/v2
+authorization: bearer b2d082f2-2e51-4880-8119-5471c5287bf9
 Content-Type: application/json
-Content-Length: 77
+Content-Length: 114
 Connection: Keep-Alive
 User-Agent: Apache-HttpClient/4.5.14 (Java/17.0.6)
 Accept-Encoding: br,deflate,gzip,x-gzip
 
 {
+  "courseScheduleId": "912",
+  "type": "HOMEWORK",
+  "search": "",
+  "subjectId": 5,
   "page": 1,
-  "rows": 10,
-  "liveGroupId": 102,
-  "search": "测试5961"
+  "rows": 10
 }
 
-<> 2023-06-14T105355.200.json
+<> 2023-06-14T175144.200.json
 
 ###
 
-POST http://127.0.0.1:8005/vipGroupManage/liveStudentList
-Authorization: bearer b2d082f2-2e51-4880-8119-5471c5287bf9
+POST http://127.0.0.1:9002/courseHomework/findCourseStudentsPublicSubject/v2
+authorization: bearer b2d082f2-2e51-4880-8119-5471c5287bf9
 Content-Type: application/json
-Content-Length: 51
+Content-Length: 116
 Connection: Keep-Alive
 User-Agent: Apache-HttpClient/4.5.14 (Java/17.0.6)
 Accept-Encoding: br,deflate,gzip,x-gzip
 
 {
+  "courseScheduleId": "912",
+  "type": "HOMEWORK",
+  "search": "",
+//  "subjectId": 4,
   "page": 1,
-  "rows": 10,
-  "liveGroupId": 102
+  "rows": 10
 }
 
-<> 2023-06-14T105332.200.json
+<> 2023-06-14T175113.200.json
 
 ###
 
-GET http://127.0.0.1:8005/task/liveCourseRemind
+POST http://127.0.0.1:9002/courseHomework/findCourseStudentsPublicSubject/v2
+authorization: bearer b2d082f2-2e51-4880-8119-5471c5287bf9
+Content-Type: application/json
+Content-Length: 114
 Connection: Keep-Alive
 User-Agent: Apache-HttpClient/4.5.14 (Java/17.0.6)
 Accept-Encoding: br,deflate,gzip,x-gzip
 
-<> 2023-06-13T183554.200.json
+{
+  "courseScheduleId": "912",
+  "type": "HOMEWORK",
+  "search": "",
+  "subjectId": 4,
+  "page": 1,
+  "rows": 10
+}
+
+<> 2023-06-14T175102.200.json
 
 ###
 
-GET http://127.0.0.1:8005/task/liveCourseRemind
+POST http://127.0.0.1:9002/teacher/findCourseStudentsSubjectPublic/v2
+authorization: bearer b2d082f2-2e51-4880-8119-5471c5287bf9
+Content-Type: application/json
+Content-Length: 96
 Connection: Keep-Alive
 User-Agent: Apache-HttpClient/4.5.14 (Java/17.0.6)
 Accept-Encoding: br,deflate,gzip,x-gzip
 
-<> 2023-06-13T183425.200.json
+{
+  "courseScheduleId": "912",
+  "type": "HOMEWORK",
+  "search": "",
+  "page": 1,
+  "rows": 10
+}
+
+<> 2023-06-14T175049.200.json
 
 ###
 
-GET http://127.0.0.1:8005/task/liveCourseRemind
+POST http://127.0.0.1:9002/courseHomework/findCourseStudentsPublicSubject/v2
+authorization: bearer b2d082f2-2e51-4880-8119-5471c5287bf9
+Content-Type: application/json
+Content-Length: 114
 Connection: Keep-Alive
 User-Agent: Apache-HttpClient/4.5.14 (Java/17.0.6)
 Accept-Encoding: br,deflate,gzip,x-gzip
 
-<> 2023-06-13T183308.200.json
+{
+  "courseScheduleId": "912",
+  "type": "HOMEWORK",
+  "search": "",
+  "subjectId": 5,
+  "page": 1,
+  "rows": 10
+}
+
+<> 2023-06-14T175038.200.json
 
 ###
 
-GET http://127.0.0.1:8005/task/liveCourseRemind
+POST http://127.0.0.1:9002/teacher/findCourseStudentsSubjectPublic/v2
+authorization: bearer b2d082f2-2e51-4880-8119-5471c5287bf9
+Content-Type: application/json
+Content-Length: 96
 Connection: Keep-Alive
 User-Agent: Apache-HttpClient/4.5.14 (Java/17.0.6)
 Accept-Encoding: br,deflate,gzip,x-gzip
 
-<> 2023-06-13T182452.200.json
+{
+  "courseScheduleId": "912",
+  "type": "HOMEWORK",
+  "search": "",
+  "page": 1,
+  "rows": 10
+}
+
+<> 2023-06-14T175013.200.json
 
 ###
 
-GET http://127.0.0.1:9001/studentVipGroup/joinLiveRoomByShare?courseScheduleId=2179
-Authorization: bearer 093517b0-c9a4-407b-b558-0d71bf157b16
+POST http://127.0.0.1:9002/courseHomework/findCourseStudentsPublicSubject/v2
+authorization: bearer b2d082f2-2e51-4880-8119-5471c5287bf9
+Content-Type: application/json
+Content-Length: 96
 Connection: Keep-Alive
 User-Agent: Apache-HttpClient/4.5.14 (Java/17.0.6)
 Accept-Encoding: br,deflate,gzip,x-gzip
 
-<> 2023-06-12T163044.200.json
+{
+  "courseScheduleId": "912",
+  "type": "HOMEWORK",
+  "search": "",
+  "page": 1,
+  "rows": 10
+}
+
+<> 2023-06-14T174943.200.json
 
 ###
 
-GET http://127.0.0.1:9001/studentVipGroup/joinLiveRoomByShare?courseScheduleId=2179
-Authorization: bearer 093517b0-c9a4-407b-b558-0d71bf157b16
+GET http://127.0.0.1:9001/studentCourseSchedule/queryCourseId?courseId=2331
+Authorization: bearer b2d082f2-2e51-4880-8119-5471c5287bf9
 Connection: Keep-Alive
 User-Agent: Apache-HttpClient/4.5.14 (Java/17.0.6)
 Accept-Encoding: br,deflate,gzip,x-gzip
 
-<> 2023-06-12T095605.200.json
+<> 2023-06-14T155016.200.json
 
 ###
 
-GET http://127.0.0.1:9001/studentVipGroup/joinLiveRoomByShare?courseScheduleId=2179
-Authorization: bearer 093517b0-c9a4-407b-b558-0d71bf157b16
+GET http://127.0.0.1:9002/courseHomework/findCourseHomeworkDetail?courseScheduleId=912&type=HOMEWORK
+authorization: bearer b2d082f2-2e51-4880-8119-5471c5287bf9
+Content-Type: application/json
 Connection: Keep-Alive
 User-Agent: Apache-HttpClient/4.5.14 (Java/17.0.6)
 Accept-Encoding: br,deflate,gzip,x-gzip
 
-<> 2023-06-12T095427.200.json
+<> 2023-06-14T154707.200.json
 
 ###
 
-GET http://127.0.0.1:9001/studentVipGroup/joinLiveRoomByShare?courseScheduleId=2179
-Authorization: bearer 093517b0-c9a4-407b-b558-0d71bf157b16
+GET http://127.0.0.1:9001/studentCourseSchedule/queryCourseId?courseId=2162
+Authorization: bearer b2d082f2-2e51-4880-8119-5471c5287bf9
 Connection: Keep-Alive
 User-Agent: Apache-HttpClient/4.5.14 (Java/17.0.6)
 Accept-Encoding: br,deflate,gzip,x-gzip
 
-<> 2023-06-12T095323.200.json
+<> 2023-06-14T152418.200.json
 
 ###
 
-GET http://127.0.0.1:9001/studentVipGroup/joinLiveRoomByShare?courseScheduleId=2179
-Authorization: bearer 093517b0-c9a4-407b-b558-0d71bf157b16
+GET http://127.0.0.1:9002/courseHomework/findCourseHomeworkDetail?courseScheduleId=1374&type=HOMEWORK
+authorization: bearer b2d082f2-2e51-4880-8119-5471c5287bf9
+Content-Type: application/json
 Connection: Keep-Alive
 User-Agent: Apache-HttpClient/4.5.14 (Java/17.0.6)
 Accept-Encoding: br,deflate,gzip,x-gzip
 
-<> 2023-06-12T095238.200.json
+<> 2023-06-14T141306.200.json
 
 ###
 
-GET http://127.0.0.1:9001/studentVipGroup/joinLiveRoomByShare?courseScheduleId=2179
-Authorization: bearer 093517b0-c9a4-407b-b558-0d71bf157b16
+GET http://127.0.0.1:9002/courseHomework/findCourseHomeworkDetail?courseScheduleId=1374&type=HOMEWORK
+authorization: bearer b2d082f2-2e51-4880-8119-5471c5287bf9
+Content-Type: application/json
 Connection: Keep-Alive
 User-Agent: Apache-HttpClient/4.5.14 (Java/17.0.6)
 Accept-Encoding: br,deflate,gzip,x-gzip
 
-<> 2023-06-12T095217.200.json
+<> 2023-06-14T140145.200.json
 
 ###
 
-GET http://127.0.0.1:9001/studentVipGroup/joinLiveRoomByShare?courseScheduleId=2179
-Authorization: bearer 093517b0-c9a4-407b-b558-0d71bf157b16
+GET http://127.0.0.1:9002/courseHomework/findCourseHomeworkDetail?courseScheduleId=1374&type=HOMEWORK
+authorization: bearer b2d082f2-2e51-4880-8119-5471c5287bf9
+Content-Type: application/json
 Connection: Keep-Alive
 User-Agent: Apache-HttpClient/4.5.14 (Java/17.0.6)
 Accept-Encoding: br,deflate,gzip,x-gzip
 
-<> 2023-06-12T095045.200.json
+<> 2023-06-14T135932.200.json
 
 ###
 
-GET http://127.0.0.1:9001/studentVipGroup/joinLiveRoomByShare?courseScheduleId=2179
-Authorization: bearer 093517b0-c9a4-407b-b558-0d71bf157b16
+GET http://127.0.0.1:9002/courseHomework/findCourseHomeworkDetail?courseScheduleId=7&type=HOMEWORK
+authorization: bearer b2d082f2-2e51-4880-8119-5471c5287bf9
+Content-Type: application/json
 Connection: Keep-Alive
 User-Agent: Apache-HttpClient/4.5.14 (Java/17.0.6)
 Accept-Encoding: br,deflate,gzip,x-gzip
 
-<> 2023-06-12T094907.200.json
+<> 2023-06-14T135851.200.json
 
 ###
 
-GET http://127.0.0.1:9001/studentVipGroup/joinLiveRoomByShare?courseScheduleId=2179
-Authorization: bearer 81d0c352-fcc8-4812-87f5-0f7a68d10451
+GET http://127.0.0.1:9002/courseHomework/findCourseHomeworkDetail?courseScheduleId=7&type=HOMEWORK
+authorization: bearer b2d082f2-2e51-4880-8119-5471c5287bf9
+Content-Type: application/json
 Connection: Keep-Alive
 User-Agent: Apache-HttpClient/4.5.14 (Java/17.0.6)
 Accept-Encoding: br,deflate,gzip,x-gzip
 
-<> 2023-06-12T094734.200.json
+<> 2023-06-14T135813.200.json
 
 ###
 
-POST http://localhost:8005/imSendGroupMessage/send
+GET http://127.0.0.1:9002/courseHomework/findCourseHomeworkDetail?courseScheduleId=7&type=HOMEWORK
+authorization: bearer b2d082f2-2e51-4880-8119-5471c5287bf9
 Content-Type: application/json
-tenantId: 1
-Authorization: bearer 9b756b90-f27a-4ca9-99b1-da854c72eb3f
-Content-Length: 99
 Connection: Keep-Alive
 User-Agent: Apache-HttpClient/4.5.14 (Java/17.0.6)
 Accept-Encoding: br,deflate,gzip,x-gzip
 
-{"postType":"0","messageContent":"3の3","messageType":"TXT","targetIds":"232","isIncludeSender":0}
-
-<> 2023-06-09T174838.200.json
+<> 2023-06-14T135739.200.json
 
 ###
 
-GET http://127.0.0.1:8005/task/closeLiveCourseRoom
+GET http://127.0.0.1:9001/studentVipGroup/joinLiveRoomByShare?courseScheduleId=2179
+Authorization: bearer 093517b0-c9a4-407b-b558-0d71bf157b16
 Connection: Keep-Alive
 User-Agent: Apache-HttpClient/4.5.14 (Java/17.0.6)
 Accept-Encoding: br,deflate,gzip,x-gzip
 
-<> 2023-06-08T214126.200.json
+<> 2023-06-12T163044.200.json
 
 ###
 
-GET http://127.0.0.1:8005/task/closeLiveCourseRoom
+GET http://127.0.0.1:9001/studentVipGroup/joinLiveRoomByShare?courseScheduleId=2179
+Authorization: bearer 093517b0-c9a4-407b-b558-0d71bf157b16
 Connection: Keep-Alive
 User-Agent: Apache-HttpClient/4.5.14 (Java/17.0.6)
 Accept-Encoding: br,deflate,gzip,x-gzip
 
-<> 2023-06-08T210807.200.json
+<> 2023-06-12T095605.200.json
 
 ###
 
-GET http://127.0.0.1:9002/teacherCourseSchedule/findCourseAttendanceDetailHeadInfo?courseScheduleId=1701
-authorization: bearer b33a3aed-ca44-4537-b3ae-1fba38c2560a
-Content-Type: application/json
+GET http://127.0.0.1:9001/studentVipGroup/joinLiveRoomByShare?courseScheduleId=2179
+Authorization: bearer 093517b0-c9a4-407b-b558-0d71bf157b16
 Connection: Keep-Alive
 User-Agent: Apache-HttpClient/4.5.14 (Java/17.0.6)
 Accept-Encoding: br,deflate,gzip,x-gzip
 
-<> 2023-06-08T194906.200.json
+<> 2023-06-12T095427.200.json
 
 ###
 
-GET http://127.0.0.1:9002/teacherCourseSchedule/findCourseAttendanceDetailHeadInfo?courseScheduleId=1701
-authorization: bearer 97fd8e85-bb3c-4967-8a07-47c44957f94a
-Content-Type: application/json
+GET http://127.0.0.1:9001/studentVipGroup/joinLiveRoomByShare?courseScheduleId=2179
+Authorization: bearer 093517b0-c9a4-407b-b558-0d71bf157b16
 Connection: Keep-Alive
 User-Agent: Apache-HttpClient/4.5.14 (Java/17.0.6)
 Accept-Encoding: br,deflate,gzip,x-gzip
 
-<> 2023-06-08T194556.200.json
+<> 2023-06-12T095323.200.json
 
 ###
 
-GET http://127.0.0.1:9002/teacherCourseSchedule/findCourseAttendanceDetailHeadInfo?courseScheduleId=1701
-authorization: bearer 97fd8e85-bb3c-4967-8a07-47c44957f94a
-Content-Type: application/json
+GET http://127.0.0.1:9001/studentVipGroup/joinLiveRoomByShare?courseScheduleId=2179
+Authorization: bearer 093517b0-c9a4-407b-b558-0d71bf157b16
 Connection: Keep-Alive
 User-Agent: Apache-HttpClient/4.5.14 (Java/17.0.6)
 Accept-Encoding: br,deflate,gzip,x-gzip
 
-<> 2023-06-08T171149.200.json
+<> 2023-06-12T095238.200.json
 
 ###
 
-GET http://127.0.0.1:8005/task/closeLiveCourseRoom
+GET http://127.0.0.1:9001/studentVipGroup/joinLiveRoomByShare?courseScheduleId=2179
+Authorization: bearer 093517b0-c9a4-407b-b558-0d71bf157b16
 Connection: Keep-Alive
 User-Agent: Apache-HttpClient/4.5.14 (Java/17.0.6)
 Accept-Encoding: br,deflate,gzip,x-gzip
 
-<> 2023-06-08T163756.200.json
+<> 2023-06-12T095217.200.json
 
 ###
 

mec-biz/src/main/java/com/ym/mec/biz/service/impl/CourseScheduleServiceImpl.java

@@ -3563,31 +3563,27 @@ public class CourseScheduleServiceImpl extends BaseServiceImpl<Long, CourseSched
 
 			CompletableFuture.runAsync(() ->
 
-					liveCourseSchedules.parallelStream().forEach(item -> {
+				// 是否是连堂课
+				String continueCourseTime = sysTenantConfigService.getTenantConfigValue(SysConfigService.ONLINE_CONTINUE_COURSE_TIME, item.getTenantId());
+				if (StringUtils.isEmpty(continueCourseTime)) {
+					continueCourseTime = "5";
+				}
 
-						// 是否是连堂课
-						String continueCourseTime = sysTenantConfigService.getTenantConfigValue(SysConfigService.ONLINE_CONTINUE_COURSE_TIME, item.getTenantId());
-						if (StringUtils.isEmpty(continueCourseTime)) {
-							continueCourseTime = "5";
-						}
+				// 查询最新课程信息
+				CourseSchedule newCourseSchedule = courseScheduleDao.get(item.getId());
+				// 连堂课更新标识
+				boolean updateFlag = true;
+				// 新课时间
+				Date newCourseScheduleDate = getDateTime(newCourseSchedule.getClassDate(), newCourseSchedule.getStartClassTime()).toDate();
+				Date oldCourseScheduleDate = getDateTime(item.getClassDate(), item.getStartClassTime()).toDate();
+				if (newCourseScheduleDate.getTime() > oldCourseScheduleDate.getTime()) {
+					newCourseSchedule = item;
+					// 更新标识
+					updateFlag = false;
+				}
 
-						// 查询最新课程信息
-						CourseSchedule newCourseSchedule = courseScheduleDao.get(item.getId());
-						if (newCourseSchedule.getClassDate().getTime() > item.getClassDate().getTime()) {
-							newCourseSchedule = item;
-						}
-						// 连堂课更新标识
-						boolean updateFlag = true;
-						// 新课时间
-						Date newCourseScheduleDate = getDateTime(newCourseSchedule.getClassDate(), newCourseSchedule.getStartClassTime()).toDate();
-						Date oldCourseScheduleDate = getDateTime(item.getClassDate(), item.getStartClassTime()).toDate();
-						if (newCourseScheduleDate.getTime() > oldCourseScheduleDate.getTime()) {
-							newCourseSchedule = item;
-							// 更新标识
-							updateFlag = false;
-						}
-						// 直播课关联直播间编号
-						String liveRoomId = getCourseScheduleLiveRoomId(newCourseSchedule, continueCourseTime, Lists.newArrayList(), Lists.newArrayList(), updateFlag);
+				// 直播课关联直播间编号
+				String liveRoomId = getCourseScheduleLiveRoomId(newCourseSchedule, continueCourseTime, Lists.newArrayList(), Lists.newArrayList(), updateFlag);
 
 						if (StringUtils.isBlank(liveRoomId)) {
 							liveRoomId = item.getLiveRoomId();
@@ -3618,13 +3614,12 @@ public class CourseScheduleServiceImpl extends BaseServiceImpl<Long, CourseSched
 							message.setContent(LiveRoomMessage.MessageContent.builder()
 									.sendUserInfo(messageUser).build());
 
-							pluginService.sendChatRoomMessage(message);
-							log.info("liveRoom sendChatRoomMessage success, liveRoomId:{}", liveRoomId);
-						} catch (Exception e) {
-							log.error("liveRoom sendChatRoomMessage error", e);
-						}
-					})
-			);
+					pluginService.sendChatRoomMessage(message);
+					log.info("liveRoom sendChatRoomMessage success, liveRoomId:{}", liveRoomId);
+				} catch (Exception e) {
+					log.error("liveRoom sendChatRoomMessage error", e);
+				}
+			});
 
 		}
 
@@ -6204,11 +6199,7 @@ public class CourseScheduleServiceImpl extends BaseServiceImpl<Long, CourseSched
 						updateFlag = false;
 					}
 					// 直播课关联直播间编号
-					String liveRoomId = getCourseScheduleLiveRoomId(newCourseSchedule, continueCourseTime, Lists.newArrayList(), Lists.newArrayList(), updateFlag);
-
-					if (StringUtils.isBlank(liveRoomId)) {
-						liveRoomId = item.getLiveRoomId();
-					}
+					String liveRoomId = getCourseScheduleLiveRoomId(item, continueCourseTime, Lists.newArrayList(), Lists.newArrayList(), true);
 
 					ImLiveBroadcastRoom liveRoom = imLiveBroadcastRoomService.getByRoomUid(liveRoomId);
 					if (Objects.isNull(liveRoom)) {
@@ -6536,17 +6527,73 @@ public class CourseScheduleServiceImpl extends BaseServiceImpl<Long, CourseSched
 
 		// 课程连堂状态
 		if (beforeCourse.get(beforeCourse.size() - 1).getContinuousCourse()) {
-			List<CourseSchedule> collect = beforeCourse.stream()
+
+			// 倒序排序
+			beforeCourse = beforeCourse.stream()
+					.sorted(Comparator.comparing(CourseSchedule::getStartClassTime).reversed())
+					.collect(Collectors.toList());
+
+			for (int i = 0; i < beforeCourse.size(); i++) {
+				CourseSchedule current = beforeCourse.get(i);
+				if (current.getContinuousCourse()) {
+					newCourseSchedules.add(current);
+				}
+
+				if (i + 1 < beforeCourse.size()) {
+					CourseSchedule next = beforeCourse.get(i + 1);
+
+					if (!next.getContinuousCourse()) {
+						newCourseSchedules.add(next);
+						break;
+					}
+				}
+			}
+
+			// 正序排序
+			beforeCourse = beforeCourse.stream()
+					.sorted(Comparator.comparing(CourseSchedule::getStartClassTime))
+					.collect(Collectors.toList());
+
+			/*for (int i = beforeCourse.size() - 1; i >= 0 ; i--) {
+				CourseSchedule current = beforeCourse.get(i);
+				CourseSchedule next = null;
+				if ((i - 1) >= 0) {
+					next = beforeCourse.get(i - 1);
+				}
+				if (next != null && current.getContinuousCourse() && next.getContinuousCourse()) {
+					newCourseSchedules.addAll(Lists.newArrayList(current, next));
+				}
+			}*/
+
+			/*List<CourseSchedule> collect = beforeCourse.stream()
 					.filter(CourseSchedule::getContinuousCourse)
 					.collect(Collectors.toList());
 			if (CollectionUtils.isNotEmpty(collect)) {
 				newCourseSchedules.addAll(collect);
-			}
+			}*/
 		}
 
 		// 课程后连堂状态
 		updateContinuousCourseStatus(continueCourseTime, afterCourse);
 		if (afterCourse.get(0).getContinuousCourse()) {
+
+			for (int i = 0; i < afterCourse.size(); i++) {
+				CourseSchedule current = afterCourse.get(i);
+				if (current.getContinuousCourse()) {
+					newCourseSchedules.add(current);
+				}
+
+				if (i + 1 < afterCourse.size()) {
+					CourseSchedule next = afterCourse.get(i + 1);
+
+					if (!next.getContinuousCourse()) {
+						newCourseSchedules.add(next);
+						break;
+					}
+				}
+			}
+
+			/*
 			List<CourseSchedule> collect = afterCourse.stream()
 					.filter(CourseSchedule::getContinuousCourse)
 					.collect(Collectors.toList());
@@ -6557,11 +6604,16 @@ public class CourseScheduleServiceImpl extends BaseServiceImpl<Long, CourseSched
 				} else {
 					newCourseSchedules.addAll(collect.subList(1, collect.size()));
 				}
-			}
+			}*/
 		}
 
 		if (CollectionUtils.isNotEmpty(newCourseSchedules)) {
 
+			// 课程按开始时间排序
+			newCourseSchedules = newCourseSchedules.stream()
+					.sorted(Comparator.comparing(CourseSchedule::getStartClassTime))
+					.collect(Collectors.toList());
+
 			// 连党课程信息
 			for (CourseSchedule item : newCourseSchedules) {
 				courseScheduleTimes.add(CourseScheduleWrapper.CourseScheduleTime.builder()
@@ -6592,9 +6644,44 @@ public class CourseScheduleServiceImpl extends BaseServiceImpl<Long, CourseSched
 					courseScheduleDao.batchUpdateContinuousCourse(collect, true);
 				}
 
-				} catch (Exception e) {
-					log.error("getLiveCourseScheduleTime courseScheduleIds={}", collect, e);
+				if (!Optional.ofNullable(updateFlag).orElse(true)) {
+
+					// 课程连堂状态
+					if (beforeCourse.get(beforeCourse.size() - 1).getContinuousCourse()) {
+
+						int size = beforeCourse.size();
+						collect = beforeCourse.subList(size - 2, size).stream()
+								.map(CourseSchedule::getId)
+								.distinct().collect(Collectors.toList());
+						if (CollectionUtils.isNotEmpty(collect)) {
+							// 更新连堂课状态
+							courseScheduleDao.batchUpdateContinuousCourse(collect, false);
+						}
+					}
+
+					// 课程后连堂状态
+					if (afterCourse.get(0).getContinuousCourse()) {
+						collect = afterCourse.stream().map(CourseSchedule::getId).distinct().collect(Collectors.toList());
+
+						if (CollectionUtils.isNotEmpty(collect)) {
+							// 关联直播间编号
+							courseScheduleDao.batchUpdateLiveRoomId(collect, "");
+							// 更新连堂课状态
+							courseScheduleDao.batchUpdateContinuousCourse(collect, false);
+						}
+					}
+				}
+
+				// 更新连堂课状态,最后一节课重置
+				CourseSchedule lastCourseSchedule = newCourseSchedules.get(newCourseSchedules.size() - 1);
+				if (Objects.nonNull(lastCourseSchedule)) {
+					courseScheduleDao.batchUpdateContinuousCourse(Lists.newArrayList(lastCourseSchedule.getId()), false);
 				}
+
+			} catch (Exception e) {
+				log.error("getLiveCourseScheduleTime courseScheduleIds={}", collect, e);
+			}
+
 			// 连堂课直播间编号
 			liveRoomId = finalCourseSchedule.getLiveRoomId();
 		} else {
@@ -6635,11 +6722,13 @@ public class CourseScheduleServiceImpl extends BaseServiceImpl<Long, CourseSched
 				endTime = getDateTime(next.getClassDate(), next.getStartClassTime());
 				// 如果当前课程结束时间和下一节课开始时间间隔小于5分钟，那么合并时间（修复代码合并）
 				if ((startTime.isBefore(endTime) || startTime.isEqual(endTime))
-						&& startTime.plusMinutes(Integer.parseInt(continueCourseTime) + 1).isAfter(endTime)) {
+						&& startTime.plusSeconds(Integer.parseInt(continueCourseTime) * 60 + 10).isAfter(endTime)) {
 					// 上节连堂状态
 					current.setContinuousCourse(true);
 					// 下节连堂状态
 					next.setContinuousCourse(true);
+				} else {
+					current.setContinuousCourse(false);
 				}
 			}
 		}

mec-biz/src/main/java/com/ym/mec/biz/service/impl/ExtracurricularExercisesServiceImpl.java

@@ -177,6 +177,9 @@ public class ExtracurricularExercisesServiceImpl extends BaseServiceImpl<Long, E
                     .getStudentMusicGroupSubject(new ArrayList<>(userIdList), exercises.getMusicGroupId());
 
             studentLessonTrainingDetailList.forEach(studentLessonTrainingDetail -> {
+                if (studentLessonTrainingDetail.getUserId() == null) {
+                    return;
+                }
                 StudentSubjectDto studentSubjectDto = subjectDtoMap.get(studentLessonTrainingDetail.getUserId().intValue());
                 if (Objects.nonNull(studentSubjectDto)) {
                     studentLessonTrainingDetail.setSubjectId(studentSubjectDto.getSubjectId().longValue());

mec-biz/src/main/java/com/ym/mec/biz/service/impl/StudentLessonExaminationServiceImpl.java

@@ -82,6 +82,9 @@ public class StudentLessonExaminationServiceImpl extends ServiceImpl<StudentLess
                 .getStudentMusicGroupSubject(new ArrayList<>(userIdList), examination.getMusicGroupId());
 
         studentLessonExaminations.forEach(studentLessonTrainingDetail -> {
+            if (studentLessonTrainingDetail.getUserId() == null) {
+                return;
+            }
             StudentSubjectDto studentSubjectDto = subjectDtoMap.get(studentLessonTrainingDetail.getUserId());
             if (Objects.nonNull(studentSubjectDto)) {
                 studentLessonTrainingDetail.setSubjectId(studentSubjectDto.getSubjectId());

mec-biz/src/main/java/com/ym/mec/biz/service/impl/TeacherAttendanceServiceImpl.java

@@ -517,6 +517,9 @@ public class TeacherAttendanceServiceImpl extends BaseServiceImpl<Long, TeacherA
                                 .getStudentMusicGroupSubject(new ArrayList<>(userIdList), classGroup.getMusicGroupId());
 
                         studentLessonTrainingDetails.forEach(studentLessonTrainingDetail -> {
+                            if (studentLessonTrainingDetail.getUserId() == null) {
+                                return;
+                            }
                             StudentSubjectDto studentSubjectDto = subjectDtoMap.get(studentLessonTrainingDetail.getUserId().intValue());
                             if (Objects.nonNull(studentSubjectDto)) {
                                 studentLessonTrainingDetail.setSubjectId(studentSubjectDto.getSubjectId().longValue());

mec-biz/src/main/resources/config/mybatis/CourseScheduleMapper.xml

@@ -4275,7 +4275,7 @@
                 and cs.type_ = #{param.classType}
             </if>
 
-            <if test="param.musicGroupId != null ">
+            <if test="param.musicGroupId != null and  param.musicGroupId != ''">
                 and #{param.musicGroupId} = cs.music_group_id_
             </if>
             <if test="param.homeWorkStatus != null">