添加字段

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

@@ -4,6 +4,16 @@ 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
+
+###
+
+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-14T145629.200.json
 
 ###
@@ -672,21 +682,3 @@ Accept-Encoding: br,deflate,gzip,x-gzip
 
 ###
 
-POST http://127.0.0.1:9002/teacherAttendance/getCurrentCourseStudents
-authorization: bearer 97fd8e85-bb3c-4967-8a07-47c44957f94a
-Content-Type: application/json
-Content-Length: 68
-Connection: Keep-Alive
-User-Agent: Apache-HttpClient/4.5.14 (Java/17.0.6)
-Accept-Encoding: br,deflate,gzip,x-gzip
-
-{
-  "courseScheduleId": 2001,
-  "status": "NORMAL",
-  "search": ""
-}
-
-<> 2023-06-08T140909.200.json
-
-###
-

mec-biz/src/main/java/com/ym/mec/biz/dal/dto/CourseScheduleDto.java

@@ -116,6 +116,17 @@ public class CourseScheduleDto extends CourseSchedule {
     @ApiModelProperty("视频数量")
     private Integer videoNum;
 
+    @ApiModelProperty(value = "预热模版")
+    private String preTemplate;
+
+    public String getPreTemplate() {
+        return preTemplate;
+    }
+
+    public void setPreTemplate(String preTemplate) {
+        this.preTemplate = preTemplate;
+    }
+
     public Integer getVideoNum() {
         return videoNum;
     }

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

@@ -6039,6 +6039,16 @@ public class CourseScheduleServiceImpl extends BaseServiceImpl<Long, CourseSched
             courseSchedule.setTeacherName(teacher.getRealName());
             courseSchedule.setHeadUrl(teacher.getAvatar());
         }
+
+        // 查询直播课程组
+        VipGroup vipGroup = vipGroupDao.findByCourseSchedule(courseScheduleId);
+        if (vipGroup != null) {
+            ImLiveBroadcastRoomDto imLiveBroadcastRoomDto = JSON.parseObject(vipGroup.getLiveConfigJson(), ImLiveBroadcastRoomDto.class);
+            if (imLiveBroadcastRoomDto != null) {
+                courseSchedule.setPreTemplate(imLiveBroadcastRoomDto.getPreTemplate());
+            }
+        }
+
         return courseSchedule;
 
     }

mec-web/src/main/java/com/ym/mec/web/controller/ExportController.java

@@ -2800,10 +2800,10 @@ public class ExportController extends BaseController {
         OutputStream outputStream = response.getOutputStream();
         try {
             HSSFWorkbook workbook = POIUtil.exportExcel(new String[]{"分部", "学员姓名", "学员编号", "老师姓名", "老师编号",
-                    "课程组编号", "课程编号", "课程名称", "课程组类型", "课程类型", "上课时间","签到时间", "签退时间", "考勤状态"}, new String[]{
+                    "课程组编号", "课程编号", "课程名称", "课程组类型", "课程类型", "上课时间","签到时间", "签退时间", "考勤状态","来源"}, new String[]{
                     "courseSchedule.organization.name", "username", "userId", "courseSchedule.teacherName", "teacherId", "musicGroupId", "courseScheduleId",
                     "courseSchedule.name", "groupType.desc", "courseSchedule.type.msg", "classTimeStr", "signInTime",
-                    "signOutTime", "status.msg"}, rows);
+                    "signOutTime", "status.msg","joinCourseType.msg"}, rows);
             response.setContentType("application/octet-stream");
             response.setHeader("Content-Disposition", "attac:wq" +
                     "hment;filename=courseAttendance-" + DateUtil.getDate(new Date()) + ".xls");