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
676d23d6
Commit
676d23d6
authored
May 08, 2020
by
maliang
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
上传bug修复
parent
555e03ae
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
7 additions
and
5 deletions
+7
-5
CopyrightBookServiceImpl.java
...ecurity/server/service/impl/CopyrightBookServiceImpl.java
+1
-0
CopyrightMapper.xml
src/main/resources/mybatis-mappers/CopyrightMapper.xml
+4
-4
bookMonthDetail.html
...urces/static/pages/copyrightBookData/bookMonthDetail.html
+1
-1
copyrightMonthSettlement.html
...tic/pages/copyrightBookData/copyrightMonthSettlement.html
+1
-0
No files found.
src/main/java/com/boot/security/server/service/impl/CopyrightBookServiceImpl.java
View file @
676d23d6
...
...
@@ -285,6 +285,7 @@ public class CopyrightBookServiceImpl implements CopyrightBookService {
Integer
status
=
null
;
List
<
BaseSettlement
>
baseSettlementList
=
new
ArrayList
<>();
if
(
copyrightId
==
null
||
copyrightId
==
0
){
System
.
out
.
println
(
copyrightId
);
baseSettlementList
=
copyrightDao
.
selectCopyrightById
(
UserUtil
.
getLoginUser
().
getId
());
}
else
{
BaseSettlement
baseSettlement
=
new
BaseSettlement
();
...
...
src/main/resources/mybatis-mappers/CopyrightMapper.xml
View file @
676d23d6
...
...
@@ -120,10 +120,10 @@
a.report_date>
= '2020-04' and a.report_date
<
= #{endTime}
]]>
<if
test=
"bookId != null and bookId!='' "
>
and
b
.book_id = #{bookId}
and
a
.book_id = #{bookId}
</if>
<if
test=
" bookName != null and bookName !='' "
>
and
b
.book_name like #{bookName}
and
a
.book_name like #{bookName}
</if>
<if
test=
"copyrightIdList != null"
>
and a.copyright_id in
...
...
@@ -142,10 +142,10 @@
a.report_date>
= '2020-04' and a.report_date
<
= #{endTime}
]]>
<if
test=
"bookId != null and bookId!='' "
>
and
b
.book_id = #{bookId}
and
a
.book_id = #{bookId}
</if>
<if
test=
" bookName != null and bookName !='' "
>
and
b
.book_name like #{bookName}
and
a
.book_name like #{bookName}
</if>
<if
test=
"copyrightIdList != null"
>
and a.copyright_id in
...
...
src/main/resources/static/pages/copyrightBookData/bookMonthDetail.html
View file @
676d23d6
...
...
@@ -98,7 +98,7 @@
,
defaultToolbar
:
[
'exports'
]
,
cols
:
[[
{
field
:
'reportDate'
,
title
:
'日期'
,
sort
:
true
,
fixed
:
'left'
}
,{
field
:
'bookId'
,
title
:
'cpId'
,
hide
:
true
}
,{
field
:
'bookId'
,
title
:
'cpId'
}
,{
field
:
'bookName'
,
title
:
'书名'
}
,{
field
:
'authors'
,
title
:
'作者'
}
,{
field
:
'totalAmount'
,
title
:
'销售金额'
}
...
...
src/main/resources/static/pages/copyrightBookData/copyrightMonthSettlement.html
View file @
676d23d6
...
...
@@ -274,6 +274,7 @@
}
function
setSchema
(){
copyrights
=
copyrightId
.
val
();
var
list
=
{
copyrightIds
:
copyrights
};
$
.
ajax
({
//请求方式
...
...
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