feat:联调课程关联培训任务接口

src/modules/course-manage/components/LiveCourseList.jsx

@@ -70,7 +70,6 @@ class LiveCourseList extends React.Component {
 
     const htmlUrl = `${LIVE_SHARE}live_detail/${liveCourseId}?id=${User.getStoreId()}`;
     const longUrl = htmlUrl;
-    console.log('htmlUrl', htmlUrl, longUrl);
 
     const shareData = { ...item, longUrl };
     const shareLiveModal = (
@@ -736,15 +735,14 @@ class LiveCourseList extends React.Component {
   handleRelatedModalShow = (item) => {
     const selectPlanList = {};
     if (item.relatedPlanList) {
-      item.relatedPlanList.map((item, index) => {
-        selectPlanList[item.taskId] = {};
-        selectPlanList[item.taskId].taskId = item.taskId;
-        selectPlanList[item.taskId].taskBaseVOList = [{ taskId: item.taskId }];
+      item.relatedPlanList.map((childItem, index) => {
+        selectPlanList[childItem.taskId] = {};
+        selectPlanList[childItem.taskId].taskId = childItem.taskId;
+        selectPlanList[childItem.taskId].taskBaseVOList = [{ stageId: childItem.stageId }];
         return item;
       });
     }
 
-    console.log('selectPlanList:', selectPlanList);
     this.setState({
       RelatedPlanModalVisible: true,
       selectCourseId: item.liveCourseId,
@@ -757,6 +755,7 @@ class LiveCourseList extends React.Component {
     });
   };
   onChangeSelectPlanList = (selectPlanList) => {
+    console.log('selectPlanList', selectPlanList);
     this.setState({
       selectPlanList: selectPlanList,
     });

src/modules/course-manage/graphics-course/components/GraphicsCourseList.jsx

 /*
  * @Author: 吴文洁
  * @Date: 2020-08-05 10:12:45
- * @LastEditors: wufan
- * @LastEditTime: 2021-08-06 17:42:37
+ * @LastEditors: yuananting
+ * @LastEditTime: 2021-08-16 23:34:03
  * @Description: 线上课-列表模块
  * @Copyright: 杭州杰竞科技有限公司 版权所有
  */
@@ -194,7 +194,7 @@ class GraphicsCourseList extends React.Component {
                   <Tooltip title={this.handlePlanName(record.relatedPlanList)} placement='top' arrowPointAtCenter>
                     {record.relatedPlanList.map((item, index) => {
                       return (
-                        <span key={item.planId}>
+                        <span key={item.taskId}>
                           {item.planName} {index < record.relatedPlanList.length - 1 && <span> 、</span>}{' '}
                         </span>
                       );
@@ -245,10 +245,10 @@ class GraphicsCourseList extends React.Component {
   handleRelatedModalShow = (item) => {
     const selectPlanList = {};
     if (item.relatedPlanList) {
-      item.relatedPlanList.map((item, index) => {
-        selectPlanList[item.planId] = {};
-        selectPlanList[item.planId].planId = item.planId;
-        selectPlanList[item.planId].taskBaseVOList = [{ taskId: item.taskId }];
+      item.relatedPlanList.map((childItem, index) => {
+        selectPlanList[childItem.taskId] = {};
+        selectPlanList[childItem.taskId].taskId = childItem.taskId;
+        selectPlanList[childItem.taskId].taskBaseVOList = [{ stageId: childItem.stageId }];
         return item;
       });
     }
@@ -408,22 +408,7 @@ class GraphicsCourseList extends React.Component {
     };
     this.props.onChange(_query);
   };
-  handleRelatedModalShow = (item) => {
-    const selectPlanList = {};
-    if (item.relatedPlanList) {
-      item.relatedPlanList.map((item, index) => {
-        selectPlanList[item.planId] = {};
-        selectPlanList[item.planId].planId = item.planId;
-        selectPlanList[item.planId].taskBaseVOList = [{ taskId: item.taskId }];
-        return item;
-      });
-    }
-    this.setState({
-      RelatedPlanModalVisible: true,
-      selectCourseId: item.id,
-      selectPlanList: selectPlanList,
-    });
-  };
+
   closeRelatedPlanModalVisible = () => {
     this.setState({
       RelatedPlanModalVisible: false,
@@ -487,16 +472,6 @@ class GraphicsCourseList extends React.Component {
             onConfirm={this.onConfirmSelectPlanList}
           />
         )}
-        {RelatedPlanModalVisible && (
-          <RelatedPlanModal
-            onClose={this.closeRelatedPlanModalVisible}
-            visible={RelatedPlanModalVisible}
-            selectCourseId={selectCourseId}
-            selectPlanList={selectPlanList}
-            onChange={this.onChangeSelectPlanList}
-            onConfirm={this.onConfirmSelectPlanList}
-          />
-        )}
         {this.state.shareLiveModal}
         {this.state.watchDataModal}
       </div>

src/modules/course-manage/modal/RelatedPlanModal.jsx

@@ -123,9 +123,8 @@ class RelatedPlanModal extends React.Component {
       }
       _selectPlanList[taskId].taskBaseVOList = [];
       _selectPlanList[taskId].taskId = taskId;
-      _selectPlanList[taskId].taskBaseVOList.push(record);
+      _selectPlanList[taskId].taskBaseVOList.push({ ...record, stageId: record.taskId });
     } else {
-      console.log(_selectPlanList[taskId]);
       if (!_selectPlanList[taskId]) {
         _selectPlanList[taskId] = {};
       }
@@ -141,7 +140,7 @@ class RelatedPlanModal extends React.Component {
       if (selectPlanList[key].taskBaseVOList) {
         item.taskId = selectPlanList[key].taskId;
         if (selectPlanList[key].taskBaseVOList[0]) {
-          item.stageId = selectPlanList[key].taskBaseVOList[0].taskId;
+          item.stageId = selectPlanList[key].taskBaseVOList[0].stageId;
         }
       }
       if (item.stageId) {
@@ -177,7 +176,6 @@ class RelatedPlanModal extends React.Component {
   render() {
     const { size, dataSource, totalCount, query } = this.state;
     const { visible, selectPlanList } = this.props;
-    console.log('selectPlanListselectPlanListselectPlanListselectPlanListselectPlanList', selectPlanList);
     return (
       <Modal
         title='关联培训任务'
@@ -237,8 +235,6 @@ class RelatedPlanModal extends React.Component {
                   taskBaseVOList = selectPlan.taskBaseVOList;
                 }
 
-                console.log('selectPlan==============taskBaseVOList:', taskBaseVOList);
-
                 return (
                   <div>
                     <XMTable
@@ -253,7 +249,7 @@ class RelatedPlanModal extends React.Component {
                       className='child-table'
                       rowSelection={{
                         type: 'checkbox',
-                        selectedRowKeys: _.pluck(taskBaseVOList, 'taskId'),
+                        selectedRowKeys: _.pluck(taskBaseVOList, 'stageId'),
                         onSelect: (record, selected) => {
                           this.selectPlanList(record, selected, _record.taskId);
                         },