解决特定情况下导出方案文件名日期不对的问题

analysis/scheme_data.py

@@ -216,26 +216,35 @@ def _main():
 
 class sch_data(object):
     def __init__(self):
-        self.scheme_name=""
-    def datas_sql(self):
+        pass
+        # self.scheme_name=""
+        # self.date_start=""
+        # self.date_end=""
+    def select_scheme(self):
         fileName,fileType = QFileDialog.getOpenFileNames(None, "选取文件", os.getcwd(), 
                 "检测方案(*.json)")
+        self.scheme_name=fileName[0]
         if(len(fileName)==0):
             print("user cancelled.")
-            return None,None
+            return False
         print(fileName,fileType)
-        scheme_name=fileName[0]
         info=_get_info()
         quest=quest_text("请输入要获取数据的日期",info[3]+','+info[4])
         ack,date_interval=quest.show()
         if(ack!=True):
             print("user cancelled.")
-            return None,None
+            return False
         date_interval=date_interval.split(',')
-        date_start=date_interval[0]+" 00:00:00"
-        date_end=date_interval[1]+" 23:59:59"
+        self.date_start=date_interval[0]+" 00:00:00"
+        self.date_end=date_interval[1]+" 23:59:59"
         _save_info((info[0],info[1],info[2],date_interval[0],date_interval[1]))
-        self.scheme_name=scheme_name
+        return True
+    def datas_sql(self):
+        if(self.scheme_name==None):
+            return None,None
+        if(self.date_start==None) or (self.date_end==None):
+            return None,None
+        scheme_name=self.scheme_name
         title,scheme_id=_json_extract_retinfo(scheme_name)
         data_list=[]
         for i in title:
@@ -246,15 +255,14 @@ class sch_data(object):
             cmd="""SELECT id,create_time,addr,err_code,valuez FROM  check_result_detail 
             where create_time > %s and create_time < %s  
             and result_id in (select pk from check_result where plan_id =%s) ;"""
-            cur.execute(cmd,(date_start,date_end,scheme_id))
+            cur.execute(cmd,(self.date_start,self.date_end,scheme_id))
             check_data=cur.fetchall()
-            print("check_data_len=",len(check_data))
             for row in check_data:
                 if(row[3]==0):
                     s=row[4].split(',')
                     for i in range(len(s)):
                         data_list[i].append(int(s[i]))
-        return title,data_list
+        return title,data_list,len(check_data)
 
     def export_scheme(self,ret_limit):
         name=self.scheme_name
@@ -276,6 +284,8 @@ class sch_data(object):
                     j["Max"]=ret_limit[index][0]
                     j["Min"]=ret_limit[index][1]
             json_obj["PlanID"],sid=_reflush_scheme_id(json_obj["PlanID"])
+            # 刷新方案id号之后更新日期
+            date=_get_info()[0]
             save_name=save_name+"_"+date+"{d:02d}".format(d=sid)
             json_obj["PlanBrief"]=save_name
             json_str=json.dumps(json_obj, sort_keys=True, indent=4, separators=(',', ': '),ensure_ascii=False)