Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in / Register
Toggle navigation
T
traffic-front
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
wangxiaoming
traffic-front
Commits
eb9d24e0
Commit
eb9d24e0
authored
Jul 24, 2018
by
neo
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
[bugfix] null validate befrom use list.size
parent
df2faa4e
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
3 additions
and
3 deletions
+3
-3
JournalEntryImportServiceImpl.java
.../atms/vat/service/impl/JournalEntryImportServiceImpl.java
+3
-3
No files found.
atms-api/src/main/java/pwc/taxtech/atms/vat/service/impl/JournalEntryImportServiceImpl.java
View file @
eb9d24e0
...
...
@@ -116,7 +116,7 @@ public class JournalEntryImportServiceImpl {
}
public
void
ImportJournalEntryData
(
List
<
VoucherDtoOnlyForImport
>
journalEntryList
,
Integer
importType
,
String
userID
)
{
if
(
journalEntryList
.
size
()
>
0
)
{
if
(
journalEntryList
!=
null
&&
journalEntryList
.
size
()
>
0
)
{
Set
<
Integer
>
periods
=
journalEntryList
.
stream
().
collect
(
Collectors
.
groupingBy
(
VoucherDtoOnlyForImport:
:
getPeriod
,
Collectors
.
counting
())).
keySet
();
...
...
@@ -228,7 +228,7 @@ public class JournalEntryImportServiceImpl {
criteria
.
andImportTypeEqualTo
(
VatImportType
.
AuditAdjust
.
getCode
());
if
(
queryDto
.
getPeriodId
()
>
Constant
.
WholeYear
)
criteria
.
andPeriodEqualTo
(
queryDto
.
getPeriodId
());
List
<
Voucher
>
query
=
voucherMapper
.
selectByExample
(
example
);
if
(
qRsult
.
getPageInfo
()==
null
)
qRsult
.
setPageInfo
(
new
PagingDto
());
if
(
qRsult
.
getPageInfo
()
==
null
)
qRsult
.
setPageInfo
(
new
PagingDto
());
qRsult
.
getPageInfo
().
setTotalCount
(
query
.
size
());
BigDecimal
sumDebit
=
new
BigDecimal
(
0
);
BigDecimal
sumCredit
=
new
BigDecimal
(
0
);
...
...
@@ -240,7 +240,7 @@ public class JournalEntryImportServiceImpl {
qRsult
.
getCalculateData
().
setDebit
(
sumDebit
);
qRsult
.
getCalculateData
().
setCredit
(
sumCredit
);
if
(
qRsult
.
getPageInfo
().
getTotalCount
()>
0
)
{
if
(
qRsult
.
getPageInfo
().
getTotalCount
()
>
0
)
{
PagingList
pagingList
=
new
PagingList
(
query
,
qRsult
.
getPageInfo
());
qRsult
.
setList
(
pagingList
.
getPagingList
());
}
...
...
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