Merge branch 'feature/zhujian/0726/qwLiving' into dev

src/common/js/wechatApi.js

@@ -179,7 +179,8 @@ export default class WechatApi {
             } else if (res.err_msg === "replayLiving:fail_not allow to cross app") {
             } else if (res.err_msg === "replayLiving:fail_not allow to cross app") {
               err = "不可跨应用使用直播ID"
               err = "不可跨应用使用直播ID"
             } else if (res.err_msg === "replayLiving:fail_living has no replay") {
             } else if (res.err_msg === "replayLiving:fail_living has no replay") {
-              err = "直播回放已失效或不存在"
+              // err = "直播回放已失效或不存在"
+              err = "该直播课未录制回放"
             } else if (res.err_msg === "replayLiving:fail_replay is beging creating") {
             } else if (res.err_msg === "replayLiving:fail_replay is beging creating") {
               err = "回放生成中，请耐心等待"
               err = "回放生成中，请耐心等待"
             } else if (res.err_msg === "replayLiving:fail_create replay failed") {
             } else if (res.err_msg === "replayLiving:fail_create replay failed") {

src/data-source/course/request-api.ts

@@ -42,6 +42,10 @@ export function exportStudentCourseData(params: object) {
   return Service.Hades("public/courseCloud/exportCourseCloudVisitorAsync", params);
   return Service.Hades("public/courseCloud/exportCourseCloudVisitorAsync", params);
 }
 }
 
 
+export function exportWorkWXStudentCourseData(params: object) {
+  return Service.Hades("public/courseCloud/exportWechatLiveStudentData", params);
+}
+
 export function exportPlayBackCourseData(params: object) {
 export function exportPlayBackCourseData(params: object) {
   return Service.Hades("public/courseCloud/exportCourseCloudPlayBackSync", params);
   return Service.Hades("public/courseCloud/exportCourseCloudPlayBackSync", params);
 }
 }

src/domains/course-domain/CourseService.ts

@@ -10,7 +10,7 @@ import {
   fetchLecturerData, getCategoryTree, knowledgeMediaCoursePage, fetchUserData, exportStudentCourseData, exportPlayBackCourseData, fetchPlaybackList, createLiveCloudCourse, getLiveCloudCoursePage,
   fetchLecturerData, getCategoryTree, knowledgeMediaCoursePage, fetchUserData, exportStudentCourseData, exportPlayBackCourseData, fetchPlaybackList, createLiveCloudCourse, getLiveCloudCoursePage,
   getLiveCloudCourseDetail, updateLiveCloudCourse, turnOnOrOffLiveCloudCourse, delLiveCloudCourse, changeVideoShelfState, createVideoSchedule, delVideoSchedule,
   getLiveCloudCourseDetail, updateLiveCloudCourse, turnOnOrOffLiveCloudCourse, delLiveCloudCourse, changeVideoShelfState, createVideoSchedule, delVideoSchedule,
   editVideoSchedule, userWatchInfo, videoSchedulePage, videoScheduleDetail, videoWatchInfo, getQrcode, getLiveCloudCourseBasePage, videoScheduleBasePage, relatedCourseToPlan,
   editVideoSchedule, userWatchInfo, videoSchedulePage, videoScheduleDetail, videoWatchInfo, getQrcode, getLiveCloudCourseBasePage, videoScheduleBasePage, relatedCourseToPlan,
-  lineDetailWatchInfo, createWorkWXLiveCourse, fetchWorkWXLecturerData, fetchWorkWXUserData, getWorkWXLiveCourseDetail, updateWorkWXLiveCourse, delWorkWXLiveCourse
+  lineDetailWatchInfo, createWorkWXLiveCourse, fetchWorkWXLecturerData, fetchWorkWXUserData, getWorkWXLiveCourseDetail, updateWorkWXLiveCourse, delWorkWXLiveCourse, exportWorkWXStudentCourseData
 } from '@/data-source/course/request-api';
 } from '@/data-source/course/request-api';
 
 
 export default class courseService {
 export default class courseService {
@@ -51,6 +51,10 @@ export default class courseService {
   static exportStudentCourseData(params: any) {
   static exportStudentCourseData(params: any) {
     return exportStudentCourseData(params);
     return exportStudentCourseData(params);
   }
   }
+  // 导出企微学生上课数据
+  static exportWorkWXStudentCourseData(params: any) {
+    return exportWorkWXStudentCourseData(params);
+  }
 
 
   // 导出回放数据
   // 导出回放数据
   static exportPlayBackCourseData(params: any) {
   static exportPlayBackCourseData(params: any) {

src/modules/course-manage/DataList/CourseData.jsx

@@ -252,21 +252,40 @@ class DataList extends React.Component {
   handleExportV5 = () => {
   handleExportV5 = () => {
     const { liveCourseId, storeId } = this.state;
     const { liveCourseId, storeId } = this.state;
 
 
-    CourseService.exportStudentCourseData({
-      liveCourseId: liveCourseId,
-      exportLiveType: 'VISITOR',
-      storeId,
-    }).then((res) => {
-      const link = res.result;
-      this.setState({
-        link,
+    if (this.state.type === "qiwei") {
+      CourseService.exportWorkWXStudentCourseData({
+        liveCourseId: liveCourseId,
+        exportLiveType: 'VISITOR',
+        storeId,
+      }).then((res) => {
+        const link = res.result;
+        this.setState({
+          link,
+        });
+        document.getElementById('loadExcel').click();
+  
+        if (res.success) {
+          message.success('导出成功！');
+        }
       });
       });
-      document.getElementById('loadExcel').click();
+    } else {
+      CourseService.exportStudentCourseData({
+        liveCourseId: liveCourseId,
+        exportLiveType: 'VISITOR',
+        storeId,
+      }).then((res) => {
+        const link = res.result;
+        this.setState({
+          link,
+        });
+        document.getElementById('loadExcel').click();
+  
+        if (res.success) {
+          message.success('导出成功！');
+        }
+      });
+    }
 
 
-      if (res.success) {
-        message.success('导出成功！');
-      }
-    });
   };
   };
 
 
   handleCheckEnterTimes = () => {
   handleCheckEnterTimes = () => {