diff --git a/ETL/Mars/Model/HuiJiModel.py b/ETL/Mars/Model/HuiJiModel.py index 62909c3..4df75f7 100644 --- a/ETL/Mars/Model/HuiJiModel.py +++ b/ETL/Mars/Model/HuiJiModel.py @@ -27,6 +27,8 @@ class HuiJiModel(object): # 根据任务ID获取表名 def getTableName(self, task_id): res = self.getTask(task_id) + if res is None: + return None moudle_id = res["module_id"] table_name = self.tablePrefix + str(moudle_id) return table_name @@ -100,7 +102,10 @@ class HuiJiModel(object): # 获取任务 def getTask(self, task_id): sql = "select * from t_huiji_task where task_id=%s" % task_id - return Db.findFirst(sql) + l1 = Db.find(sql) + if len(l1) == 0: + return None + return l1[0] def expandTaskReceiveOrgsPrefix(self, record): r = json.loads(record["range_json"]) @@ -441,6 +446,8 @@ class HuiJiModel(object): # 获取填报情况 def getTaskFillInfo(self, task_id, flag, page, limit): table_name = self.getTableName(task_id) + if table_name is None: + return None, 0 sql = "select distinct t1.org_code,t2.organizationname,t1.flag from {table_name} as t1 inner join schoolbusinessrelation as t2 on t1.org_code=t2.organizationno ".format( table_name=table_name) sql = sql + " where task_id={task_id} and t2.recordyear={recordyear}".format(task_id=task_id, diff --git a/ETL/Mars/Model/__pycache__/HuiJiModel.cpython-37.pyc b/ETL/Mars/Model/__pycache__/HuiJiModel.cpython-37.pyc index 81c372c..c3c708f 100644 Binary files a/ETL/Mars/Model/__pycache__/HuiJiModel.cpython-37.pyc and b/ETL/Mars/Model/__pycache__/HuiJiModel.cpython-37.pyc differ