定时任务修改

Signed-off-by: binren <zhangbr@elab-plus.com>

report_push.py

@@ -478,14 +478,14 @@ class ReportPush(object):
                 log_data = []
                 try:
                     if value[2]:
-                        for mail in self.mails:
-                            result = email_util.send_mail_by_admin(title, content, mail, value[2], value[3])
-                            if result:
-                                log_data = [value[0], value[1], value[2], 1, 'success!!!']
-                            else:
-                                result = email_util.send_mail_by_admin(title, content, mail, value[2], value[3])
-                                if not result:
-                                    log_data = [value[0], value[1], value[2], -1, '第二次发送失败']
+                        # for mail in self.mails:
+                        result = email_util.send_mail_by_admin(title, content, value[1], value[2], value[3])
+                        if result:
+                            log_data = [value[0], value[1], value[2], 1, 'success!!!']
+                        else:
+                            result = email_util.send_mail_by_admin(title, content, value[1], value[2], value[3])
+                            if not result:
+                                log_data = [value[0], value[1], value[2], -1, '第二次发送失败']
                 except Exception as e:
                     log_data = [value[0], value[1], value[2], -1, str(e)]
                     print(str(e))
@@ -503,7 +503,7 @@ class ReportPush(object):
             return message
 
     def get_title_content(self, task_key, time_range):
-        if task_key == 1:
+        if task_key in (1, 4):
             return '移动案场订阅日报[{}]'.format(time_range[0]), '本期间内【{}】至【{}】的数据报告已经准备完成。请点击附件查阅。'.format(time_range[0], time_range[1])
         elif task_key in (2, 3):
             return '移动案场订阅周报[{}]至[{}]'.format(time_range[0], time_range[1]), '本期间内【{}】至【{}】的数据报告已经准备完成。请点击附件查阅.'.format(time_range[0], time_range[1])
@@ -520,7 +520,7 @@ class ReportPush(object):
             customers = self.db.select(self.sql_4, [task_key])
             # a.task_key, a.customer_id, b.customer_type, b.`name`, b.mail, GROUP_CONCAT(c.house_or_brand_id)
             time_range = self.get_time_range(task_key)
-            all_time_rang = self.get_time_range(4)
+            all_time_rang = self.get_time_range(9999)
             # 有限时间范围内的数据
             xcx_top_data = self.xcx_top(time_range)
             brand_top_data = self.brand_top(time_range)
@@ -1081,12 +1081,12 @@ class ReportPush(object):
             pre_time = now_time + datetime.timedelta(days=-7)
             now_time = now_time + datetime.timedelta(days=-1)
             pass
-        elif task_key in (1, 1):
+        elif task_key in (1, 4):
             # 昨天
             pre_time = now_time + datetime.timedelta(days=-1)
             now_time = now_time + datetime.timedelta(days=-1)
             pass
-        elif task_key in (4, 4):
+        elif task_key in (9999, 9999):
             # 不限时间
             pre_time = now_time + datetime.timedelta(days=-2999)
         return [pre_time.strftime('%Y-%m-%d'), now_time.strftime('%Y-%m-%d')]

xlwt_util.py

@@ -131,7 +131,7 @@ class XlwtUtil(object):
         day = '移动案场订阅日报_{}_{}.xls'
         week = '移动案场订阅周报_{}_{}至{}.xls'
         new_file_name = self.save_path_create()
-        if task_key == 1:
+        if task_key in (1, 4):
             day = day.format(name, time_range[0])
             return ['{}/{}'.format(new_file_name, day), day]
         elif task_key in (2, 3):
@@ -165,7 +165,7 @@ class XlwtUtil(object):
                 # 周报
                 sheet_name = '周报'
                 title = self.title.get('week')
-            elif task_key == 1:
+            elif task_key in (1, 4):
                 # 日报
                 sheet_name = '日报'
                 title = self.title.get('day')