Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Sign in
Toggle navigation
F
fund_report
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Packages
Packages
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
彭熊
fund_report
Commits
8e4973b7
Commit
8e4973b7
authored
Jan 22, 2021
by
pengxiong
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
读取数据库理财师默认模版
parent
6518fb75
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
13 additions
and
4 deletions
+13
-4
report_service.py
app/service/report_service.py
+13
-4
No files found.
app/service/report_service.py
View file @
8e4973b7
...
@@ -15,7 +15,8 @@ from sqlalchemy import and_, or_
...
@@ -15,7 +15,8 @@ from sqlalchemy import and_, or_
# from sqlalchemy import union_all
# from sqlalchemy import union_all
from
app.api.engine
import
TAMP_SQL
,
tamp_diagnose_app_engine
,
template_folder
,
temp_img_save_folder
,
pdf_save_folder
from
app.api.engine
import
TAMP_SQL
,
tamp_diagnose_app_engine
,
template_folder
,
temp_img_save_folder
,
pdf_save_folder
from
app.model.tamp_diagnose_app
import
HoldReport
,
HoldDiagnoseReport
,
PeriodicReport
,
Customer
,
ReportView
from
app.model.tamp_diagnose_app
import
HoldReport
,
HoldDiagnoseReport
,
PeriodicReport
,
Customer
,
ReportView
,
\
FundReportManange
from
app.utils.jinjia2html_v2
import
DataIntegrate
from
app.utils.jinjia2html_v2
import
DataIntegrate
from
app.utils.celery
import
save_pdf
from
app.utils.celery
import
save_pdf
...
@@ -188,8 +189,9 @@ def make_report(args):
...
@@ -188,8 +189,9 @@ def make_report(args):
args
[
'create_time'
]
=
datetime
.
datetime
.
now
()
args
[
'create_time'
]
=
datetime
.
datetime
.
now
()
args
[
'update_status'
]
=
1
args
[
'update_status'
]
=
1
#
args.pop('type')
args
.
pop
(
'type'
)
record_id
=
0
record_id
=
0
default_template
=
''
with
TAMP_SQL
(
tamp_diagnose_app_engine
)
as
tamp_diagnose_app
:
with
TAMP_SQL
(
tamp_diagnose_app_engine
)
as
tamp_diagnose_app
:
tamp_diagnose_session
=
tamp_diagnose_app
.
session
tamp_diagnose_session
=
tamp_diagnose_app
.
session
report_record
=
None
report_record
=
None
...
@@ -204,11 +206,18 @@ def make_report(args):
...
@@ -204,11 +206,18 @@ def make_report(args):
tamp_diagnose_session
.
add
(
report_record
)
tamp_diagnose_session
.
add
(
report_record
)
tamp_diagnose_session
.
flush
()
tamp_diagnose_session
.
flush
()
record_id
=
report_record
.
id
record_id
=
report_record
.
id
template
=
tamp_diagnose_session
.
query
(
FundReportManange
)
.
filter
(
and_
(
FundReportManange
.
ifa_id
==
ifa_id
,
FundReportManange
.
type
==
type
,
FundReportManange
.
default
==
1
,
FundReportManange
.
default_template
.
isnot
(
None
)
))
.
first
()
if
template
:
default_template
=
json
.
loads
(
template
.
default_template
)
# save_pdf.delay(record_id, ifa_id, customer_id, pdf_name, type)
# save_pdf.delay(record_id, ifa_id, customer_id, pdf_name, type)
try
:
try
:
dt
=
DataIntegrate
(
ifa_id
=
ifa_id
,
customer_id
=
customer_id
,
pdf_name
=
pdf_name
,
type
=
type
)
dt
=
DataIntegrate
(
ifa_id
=
ifa_id
,
customer_id
=
customer_id
,
pdf_name
=
pdf_name
,
type
=
type
)
report_data
=
dt
.
get_template_data
()
report_data
=
dt
.
get_template_data
(
default_template
=
default_template
)
report_data
=
json
.
dumps
(
report_data
)
.
replace
(
template_folder
,
temp_img_save_folder
)
report_data
=
json
.
dumps
(
report_data
)
.
replace
(
template_folder
,
temp_img_save_folder
)
report_data
=
json
.
loads
(
report_data
)
report_data
=
json
.
loads
(
report_data
)
dt
.
render_data
(
data
=
report_data
)
dt
.
render_data
(
data
=
report_data
)
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment