Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
L
lwby_copyright_book_data
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
1
Issues
1
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
maliang
lwby_copyright_book_data
Commits
ecf15df3
Commit
ecf15df3
authored
May 08, 2020
by
maliang
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
上传bug修复
parent
bac467f0
Changes
2
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
163 additions
and
101 deletions
+163
-101
CopyrightBookServiceImpl.java
...ecurity/server/service/impl/CopyrightBookServiceImpl.java
+6
-0
copyrightMonthSettlement.html
...tic/pages/copyrightBookData/copyrightMonthSettlement.html
+157
-101
No files found.
src/main/java/com/boot/security/server/service/impl/CopyrightBookServiceImpl.java
View file @
ecf15df3
...
...
@@ -19,8 +19,11 @@ public class CopyrightBookServiceImpl implements CopyrightBookService {
@Autowired
CopyrightDao
copyrightDao
;
static
Double
schema
=
0.0
;
@Override
public
String
selectSettlement
(
Integer
copyrightId
,
Integer
page
,
Integer
limit
)
{
schema
=
0.0
;
Integer
roleId
=
copyrightDao
.
selectRoleId
(
UserUtil
.
getLoginUser
().
getId
());
Integer
status
=
null
;
List
<
BaseSettlement
>
baseSettlementList
=
new
ArrayList
<>();
...
...
@@ -124,6 +127,7 @@ public class CopyrightBookServiceImpl implements CopyrightBookService {
baseSettlement
.
setSettlementAdAmount
(
Double
.
valueOf
(
df
.
format
(
count
*
0.5
)));
}
baseSettlement
.
setCountSettlement
(
Double
.
valueOf
(
df
.
format
(
baseSettlement
.
getSettlementAmount
()+
baseSettlement
.
getSettlementAdAmount
())));
schema
=
Double
.
valueOf
(
df
.
format
(
baseSettlement
.
getSettlementAmount
()+
baseSettlement
.
getSettlementAdAmount
()))+
schema
;
}
Integer
count
=
copyrightDao
.
selectTableListMonthCount
(
baseSettlementList
,
status
);
return
PageTableHandler
.
getJSONObject
(
baseSettlements
,
count
);
...
...
@@ -270,8 +274,10 @@ public class CopyrightBookServiceImpl implements CopyrightBookService {
@Override
public
String
getAllCopyright
()
{
List
<
BaseSettlement
>
baseSettlements
=
copyrightDao
.
selectCopyrightById
(
UserUtil
.
getLoginUser
().
getId
());
Integer
roleId
=
copyrightDao
.
selectRoleId
(
UserUtil
.
getLoginUser
().
getId
());
JSONObject
jsonObject
=
new
JSONObject
();
jsonObject
.
put
(
"data"
,
baseSettlements
);
jsonObject
.
put
(
"roleId"
,
roleId
);
return
jsonObject
.
toJSONString
();
}
...
...
src/main/resources/static/pages/copyrightBookData/copyrightMonthSettlement.html
View file @
ecf15df3
This diff is collapsed.
Click to expand it.
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