Skip to content

F
fund_report
Commit 7aecc10c authored by pengxiong's avatar pengxiong
Browse files
Options

fix

parent d42adbb5
Hide whitespace changes
Inline Side-by-side
Showing with 30 additions and 27 deletions
app/model/tamp_diagnose_app.py
View file @ 7aecc10c
...@@ -147,15 +147,16 @@ class HoldDiagnoseReport(Base, BaseModel): ...@@ -147,15 +147,16 @@ class HoldDiagnoseReport(Base, BaseModel):
res = tamp_user_session.execute(sql) res = tamp_user_session.execute(sql)
sql2 = "select customer_name from tamp_diagnose_app.customer_view where id = '{}'".format(self.customer_id) sql2 = "select customer_name from tamp_diagnose_app.customer_view where id = '{}'".format(self.customer_id)
res2 = tamp_diagnose_app_session.execute(sql2) res2 = tamp_diagnose_app_session.execute(sql2)
if res.fetchone(): if data:
data['author_name'] = res.fetchone()[0] if res.fetchone():
else: data['author_name'] = res.fetchone()[0]
data['author_name'] = '' else:
if res2.fetchone(): data['author_name'] = ''
data['customer_name'] = res2.fetchone()[0] if res2.fetchone():
else: data['customer_name'] = res2.fetchone()[0]
data['customer_name'] = '' else:
data['type'] = 2 data['customer_name'] = ''
data['type'] = 2
return data return data
...@@ -187,15 +188,16 @@ class HoldReport(Base, BaseModel): ...@@ -187,15 +188,16 @@ class HoldReport(Base, BaseModel):
res = tamp_user_session.execute(sql) res = tamp_user_session.execute(sql)
sql2 = "select customer_name from tamp_diagnose_app.customer_view where id = '{}'".format(self.customer_id) sql2 = "select customer_name from tamp_diagnose_app.customer_view where id = '{}'".format(self.customer_id)
res2 = tamp_diagnose_app_session.execute(sql2) res2 = tamp_diagnose_app_session.execute(sql2)
if res.fetchone(): if data:
data['author_name'] = res.fetchone()[0] if res.fetchone():
else: data['author_name'] = res.fetchone()[0]
data['author_name'] = '' else:
if res2.fetchone(): data['author_name'] = ''
data['customer_name'] = res2.fetchone()[0] if res2.fetchone():
else: data['customer_name'] = res2.fetchone()[0]
data['customer_name'] = '' else:
data['type'] = 1 data['customer_name'] = ''
data['type'] = 1
return data return data
...@@ -227,15 +229,16 @@ class PeriodicReport(Base, BaseModel): ...@@ -227,15 +229,16 @@ class PeriodicReport(Base, BaseModel):
res = tamp_user_session.execute(sql) res = tamp_user_session.execute(sql)
sql2 = "select customer_name from tamp_diagnose_app.customer_view where id = '{}'".format(self.customer_id) sql2 = "select customer_name from tamp_diagnose_app.customer_view where id = '{}'".format(self.customer_id)
res2 = tamp_diagnose_app_session.execute(sql2) res2 = tamp_diagnose_app_session.execute(sql2)
if res.fetchone(): if data:
data['author_name'] = res.fetchone()[0] if res.fetchone():
else: data['author_name'] = res.fetchone()[0]
data['author_name'] = '' else:
if res2.fetchone(): data['author_name'] = ''
data['customer_name'] = res2.fetchone()[0] if res2.fetchone():
else: data['customer_name'] = res2.fetchone()[0]
data['customer_name'] = '' else:
data['type'] = 3 data['customer_name'] = ''
data['type'] = 3
return data return data
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment