Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
F
financial-system
Project
Project
Details
Activity
Releases
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
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
xianyang
financial-system
Commits
6dce3032
Commit
6dce3032
authored
Feb 20, 2023
by
xianyang
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
优化公会结算
parent
41ca6def
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
5 additions
and
4 deletions
+5
-4
guild.py
app/api/statement/guild.py
+2
-3
recharge.py
models/recharge.py
+3
-1
No files found.
app/api/statement/guild.py
View file @
6dce3032
import
math
import
math
import
threading
import
threading
import
pandas
as
pd
from
sqlalchemy
import
and_
,
func
from
sqlalchemy
import
and_
,
func
from
sqlalchemy.orm
import
Session
from
sqlalchemy.orm
import
Session
from
models.recharge
import
Settlement
from
models.recharge
import
Settlement
...
@@ -43,9 +42,9 @@ class GuildSet(object):
...
@@ -43,9 +42,9 @@ class GuildSet(object):
if
param
.
status
or
param
.
status
==
0
:
if
param
.
status
or
param
.
status
==
0
:
is_guild_filters
.
append
(
Settlement
.
status
==
param
.
status
)
is_guild_filters
.
append
(
Settlement
.
status
==
param
.
status
)
if
param
.
start_time
:
if
param
.
start_time
:
is_guild_filters
.
append
(
Settlement
.
upd
ate_time
>=
param
.
start_time
)
is_guild_filters
.
append
(
Settlement
.
cre
ate_time
>=
param
.
start_time
)
if
param
.
end_time
:
if
param
.
end_time
:
is_guild_filters
.
append
(
Settlement
.
upd
ate_time
<=
param
.
end_time
)
is_guild_filters
.
append
(
Settlement
.
cre
ate_time
<=
param
.
end_time
)
# 判断有无条件
# 判断有无条件
try
:
try
:
if
len
(
is_guild_filters
)
>
0
:
if
len
(
is_guild_filters
)
>
0
:
...
...
models/recharge.py
View file @
6dce3032
from
sqlalchemy
import
Column
,
Integer
,
String
,
Float
,
DateTime
from
sqlalchemy
import
Column
,
Integer
,
String
,
Float
,
DateTime
,
Index
from
core.storage.db
import
Base
from
core.storage.db
import
Base
from
sqlalchemy_serializer
import
SerializerMixin
from
sqlalchemy_serializer
import
SerializerMixin
...
@@ -74,3 +74,5 @@ class Settlement(Base, SerializerMixin):
...
@@ -74,3 +74,5 @@ class Settlement(Base, SerializerMixin):
bank_name
=
Column
(
String
(
255
),
comment
=
"开户行名称"
)
bank_name
=
Column
(
String
(
255
),
comment
=
"开户行名称"
)
bank_no
=
Column
(
String
(
255
),
comment
=
"户头名称"
)
bank_no
=
Column
(
String
(
255
),
comment
=
"户头名称"
)
create_time
=
Column
(
DateTime
,
comment
=
"申请结算时间"
)
create_time
=
Column
(
DateTime
,
comment
=
"申请结算时间"
)
__table_args__
=
(
Index
(
'guild_id'
,
'status'
),
{
'comment'
:
'公会结算表'
})
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