Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
M
mancheng
Overview
Overview
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
Wiki
Wiki
Snippets
Snippets
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Administrator
mancheng
Commits
f7863ebb
Commit
f7863ebb
authored
Dec 02, 2022
by
dong
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix20221202
parent
9f18d42f
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
13 additions
and
2 deletions
+13
-2
apps/inves_manage/project_manager.py
+7
-2
apps/inves_manage/siku_view.py
+6
-0
No files found.
apps/inves_manage/project_manager.py
View file @
f7863ebb
...
...
@@ -57,6 +57,11 @@ def search_project1():
investor_name
=
req_dic
[
'investor_name'
]
investor_district
=
req_dic
[
'investor_district'
]
industry
=
req_dic
[
'industry'
]
if
'/'
in
industry
:
industry1
=
industry
.
split
(
'/'
)[
0
]
industry2
=
industry
.
split
(
'/'
)[
1
]
else
:
industry1
=
industry
investment_volume
=
req_dic
[
'investment_volume'
]
project_progress
=
req_dic
[
'project_progress'
]
project_year
=
req_dic
[
'project_year'
]
...
...
@@ -79,8 +84,8 @@ def search_project1():
ProjectManagement
.
investment_volume
>=
investment_volume
[
0
]
if
investment_volume
else
text
(
''
),
ProjectManagement
.
investment_volume
<
investment_volume
[
1
]
if
investment_volume
else
text
(
''
),
ProjectManagement
.
investor_district
.
like
(
'
%
{}
%
'
.
format
(
investor_district
))
if
investor_district
else
text
(
''
),
ProjectManagement
.
industry
.
like
(
'
%
{}
%
'
.
format
(
industry
))
if
industry
else
text
(
''
),
ProjectManagement
.
industry2
.
like
(
'
%
{}
%
'
.
format
(
industry
))
if
industry
else
text
(
''
),
ProjectManagement
.
industry
.
like
(
'
%
{}
%
'
.
format
(
industry
1
))
if
industry1
else
text
(
''
),
ProjectManagement
.
industry2
.
like
(
'
%
{}
%
'
.
format
(
industry
2
))
if
industry2
else
text
(
''
),
ProjectManagement
.
investor_name
==
investor_name
if
investor_name
else
text
(
''
),
ProjectManagement
.
project_progress
==
project_progress
if
project_progress
else
text
(
''
),
ProjectManagement
.
project_year
==
project_year
if
project_year
else
text
(
''
),
...
...
apps/inves_manage/siku_view.py
View file @
f7863ebb
...
...
@@ -154,6 +154,7 @@ def update_joint_project(row_content):
project_num
=
project_num
)
.
first
()
# 项目编号
# 更新项目信息
project_obj
.
thread_progress
=
'对接中'
,
project_obj
.
project_name
=
project_name
project_obj
.
provence
=
investor_district1
project_obj
.
city
=
investor_district2
...
...
@@ -904,6 +905,7 @@ def distribute_project():
if
not
old_distribute_condition
:
old_project_obj
.
distribute_condition
=
district
old_project_obj
.
thread_progress
=
'对接中'
old_project_obj
.
flag
=
2
db
.
session
.
commit
()
district_list1
.
append
(
district
)
...
...
@@ -1154,6 +1156,10 @@ def project_move():
return
jsonify
(
code
=
RET
.
PARAMERR
,
msg
=
"参数错误!"
)
project_obj
.
flag
=
flag
if
flag
==
3
:
project_obj
.
thread_progress
=
'已签约'
if
flag
==
4
:
project_obj
.
thread_progress
=
'已开工'
db
.
session
.
commit
()
# 记录项目动态
time1
=
datetime
.
now
()
.
strftime
(
"
%
Y-
%
m-
%
d
%
H:
%
M:
%
S"
)
...
...
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