Skip to content

F
fund_report
Commit 4237791b authored by pengxiong's avatar pengxiong
1 Browse files
Options

报告列表

parent 4483568b
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 15 additions and 2929 deletions
app/model/tamp_diagnose_app.py
View file @ 4237791b
......@@ -132,12 +132,16 @@ class HoldDiagnoseReport(Base, BaseModel):
report_data = Column(Text)
name = Column(String(100))
def __init__(self):
self.type = 2
def to_dict(self, allow_field=None):
all_field = [r.name for r in self.__table__.columns]
if allow_field:
allow_field = set(allow_field) & set(allow_field)
else:
allow_field = all_field
allow_field.append('type')
if self.file:
self.file = pdf_folder + self.file
data = {c: int(getattr(self, c).timestamp()) if isinstance(getattr(self, c), datetime.datetime) else getattr(self, c) for c in allow_field}
......@@ -159,7 +163,6 @@ class HoldDiagnoseReport(Base, BaseModel):
data['customer_name'] = res2[0]
else:
data['customer_name'] = ''
data['type'] = 2
return data
......@@ -176,12 +179,16 @@ class HoldReport(Base, BaseModel):
report_data = Column(Text)
name = Column(String(100))
def __init__(self):
self.type = 1
def to_dict(self, allow_field=None):
all_field = [r.name for r in self.__table__.columns]
if allow_field:
allow_field = set(allow_field) & set(allow_field)
else:
allow_field = all_field
allow_field.append('type')
if self.file:
self.file = pdf_folder + self.file
data = {c: int(getattr(self, c).timestamp()) if isinstance(getattr(self, c), datetime.datetime) else getattr(self, c) for c in allow_field}
......@@ -203,7 +210,6 @@ class HoldReport(Base, BaseModel):
data['customer_name'] = res2[0]
else:
data['customer_name'] = ''
data['type'] = 1
return data
......@@ -220,12 +226,16 @@ class PeriodicReport(Base, BaseModel):
report_data = Column(Text)
name = Column(String(100))
def __init__(self):
self.type = 3
def to_dict(self, allow_field=None):
all_field = [r.name for r in self.__table__.columns]
if allow_field:
allow_field = set(allow_field) & set(allow_field)
else:
allow_field = all_field
allow_field.append('type')
if self.file:
self.file = pdf_folder + self.file
data = {c: int(getattr(self, c).timestamp()) if isinstance(getattr(self, c), datetime.datetime) else getattr(self, c) for c in allow_field}
......@@ -247,7 +257,6 @@ class PeriodicReport(Base, BaseModel):
data['customer_name'] = res2[0]
else:
data['customer_name'] = ''
data['type'] = 3
return data
......
app/service/report_service.py
View file @ 4237791b
......@@ -47,23 +47,15 @@ def get_report_list(args):
PeriodicReport.update_time <= end_time
))
if type == 0:
if hold_report.all():
res.extend(hold_report)
if hold_diagnose_report.all():
res.append(hold_diagnose_report)
if periodic_report.all():
res.append(periodic_report)
# res = hold_report.union_all(hold_diagnose_report).union_all(periodic_report)
res = hold_report.union_all(hold_diagnose_report).union_all(periodic_report)
elif type == 1:
res = hold_report
elif type == 2:
res = hold_diagnose_report
elif type == 3:
res = periodic_report
# totalSize = res.count()
# data = res.offset(offset).limit(pageSize)
totalSize = len(res)
data = res[offset: pageSize]
totalSize = res.count()
data = res.offset(offset).limit(pageSize)
if data:
allow_field = ['id', 'customer_id', 'ifa_id', 'update_time', 'update_status', 'file', 'be_viewed', 'name']
data = [r.to_dict(allow_field=allow_field) for r in data]
......
app/templates/img/scene.png deleted 100644 → 0
View file @ 4483568b
This diff is collapsed.
app/templates/monthReport.html deleted 100644 → 0
View file @ 4483568b
This diff is collapsed.
app/templates/student.html deleted 100644 → 0
View file @ 4483568b
<!DOCTYPE html>
<html lang="en">
<head>
<meta charset="UTF-8">
<title>Old Boy EDU</title>
</head>
<body>
Welcome to Old Boy EDU
{{params.a}}{{params.b}}
<div>{{ student }}</div>
<table border="1xp" bgcolor="blue">
{% for foo in student %}
<tr>
<td>{{ foo.name }}</td>
<td>{{ foo.get("age") }}</td>
<td>{{ foo["gender"] }}</td>
</tr>
{% endfor %}
</table>
</body>
</html>
\ No newline at end of file
app/templates/v2/img/scene.png deleted 100644 → 0
View file @ 4483568b
This diff is collapsed.
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