修改飞书表格

common/material.py

@@ -26,72 +26,62 @@ class Material():
             list.append({"mark": mark, "mark_name": mark_name})
         return list
 
-    # 获取汇总表所有
+    # 获取常规任务汇总表所有
     @classmethod
     def feishu_list(cls):
         summary = Feishu.get_values_batch("summary", "n9xlLF")
         list = []
-        for row in summary[2:]:
+        for row in summary[1:]:
             mark = row[0]
             mark_name = row[1]
             feishu_id = row[3]
             video_call = row[4]
-            pq_id = row[7]
-
-
-            number = {"mark": mark, "feishu_id": feishu_id, "video_call": video_call, "pq_id": pq_id, "mark_name": mark_name}
-            list.append(number)
+            video_count = row[5]
+            pq_id = row[8]
+            if mark:
+                number = {"mark": mark, "feishu_id": feishu_id, "video_call": video_call, "pq_id": pq_id, "video_count": video_count, "mark_name": mark_name}
+                list.append(number)
+            else:
+                return list
         return list
 
-    # 获取汇总表所有
+    # 获取跟随汇总表所有
     @classmethod
     def feishu_gs_list(cls):
-        try:
-            summary = Feishu.get_values_batch("summary", "gGiXDp")
-            list = []
-            for row in summary[1:]:
-                mark = row[0]
-                mark_name = row[1]
-                feishu_id = row[3]
-                video_call = row[4]
-                pq_id = row[7]
-                sum_count = row[8]
-                sheet = row[5]
-                zd_count = row[8]
-                platform_list = []
-                if sheet:
-                    parts = sheet.split(',')
-                    for part in parts:
-                        sub_parts = part.split('--')
-                        platform_list.append(sub_parts)
+        summary = Feishu.get_values_batch("summary", "gGiXDp")
+        list = []
+        for row in summary[1:]:
+            mark = row[0]
+            mark_name = row[1]
+            feishu_id = row[3]
+            video_call = row[4]
+            video_count = row[5]
 
+            pq_id = row[7]
+            sum_count = row[8]
+            if mark:
                 number = {"mark": mark, "feishu_id": feishu_id, "video_call": video_call, "pq_id": pq_id,
-                          "mark_name": mark_name, "sum_count": sum_count, "platform_list": platform_list, "zd_count": zd_count}
+                          "mark_name": mark_name, "sum_count": sum_count, "video_count": video_count}
                 list.append(number)
-        except Exception as e:
-            Common.logger("gensui").warning(f"抓取异常:{e}\n")
-            return ''
+            else:
+                return list
         return list
 
     # 获取爆款汇总表所有
     @classmethod
     def feishu_bk_list(cls):
-        try:
-            summary = Feishu.get_values_batch("summary", "xJxEUH")
-            list = []
-            for row in summary[1:]:
-                mark = row[0]
-                mark_name = row[1]
-                feishu_id = row[3]
-                video_call = row[4]
-                pq_id = row[5]
-                if pq_id:
-                    number = {"mark": mark, "feishu_id": feishu_id, "video_call": video_call, "pq_id": pq_id,
-                              "mark_name": mark_name}
-                    list.append(number)
-        except Exception as e:
-            Common.logger("gensui").warning(f"抓取异常:{e}\n")
-            return ''
+        summary = Feishu.get_values_batch("summary", "xJxEUH")
+        list = []
+        for row in summary[1:]:
+            mark = row[0]
+            mark_name = row[1]
+            feishu_id = row[3]
+            video_call = row[4]
+            pq_id = row[5]
+            if pq_id:
+                number = {"mark": mark, "feishu_id": feishu_id, "video_call": video_call, "pq_id": pq_id,
+                          "mark_name": mark_name}
+                list.append(number)
         return list
 
     # 获取管理后台cookie
@@ -110,12 +100,12 @@ class Material():
         summary = Feishu.get_values_batch("summary", "n9xlLF")
         list = []
         try:
-            for row in summary[2:]:
+            for row in summary[1:]:
                 mark = row[0]
                 mark_name = row[1]
                 feishu_id = row[3]
-                sheet = row[5]
-                token = row[6]
+                sheet = row[6]
+                token = row[7]
 
                 parts = sheet.split(',')
                 result = []