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
c964b9f4
Commit
c964b9f4
authored
Sep 04, 2018
by
neo
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
[revert] revert change bb item to single ds
parent
7bf9f064
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
6 additions
and
6 deletions
+6
-6
ReportServiceImpl.java
.../pwc/taxtech/atms/vat/service/impl/ReportServiceImpl.java
+6
-6
No files found.
atms-api/src/main/java/pwc/taxtech/atms/vat/service/impl/ReportServiceImpl.java
View file @
c964b9f4
...
...
@@ -540,12 +540,12 @@ public class ReportServiceImpl extends VatAbstractService implements ReportServi
.
filter
(
y
->
y
.
getItem1
().
equals
(
a
.
getCellTemplateID
())).
collect
(
Collectors
.
toList
());
List
<
DataSourceDto
>
dataSourceDtoList
=
new
ArrayList
<>();
entryList
.
forEach
(
z
->
{
if
(
z
.
getItem2
().
getItems
()
!=
null
&&
!
z
.
getItem2
().
getItems
().
isEmpty
()
&&
z
.
getItem2
().
getItems
().
get
(
0
).
contains
(
"tag"
))
{
z
.
getItem2
().
getItems
().
forEach
(
m
->
{
ReportCellDataSourceDto
dto
=
JSON
.
parseObject
(
m
,
ReportCellDataSourceDto
.
class
);
dataSourceDtoList
.
add
(
dto
);
});
}
else
//
if (z.getItem2().getItems() != null && !z.getItem2().getItems().isEmpty() && z.getItem2().getItems().get(0).contains("tag")) {
//
z.getItem2().getItems().forEach(m -> {
//
ReportCellDataSourceDto dto = JSON.parseObject(m, ReportCellDataSourceDto.class);
//
dataSourceDtoList.add(dto);
//
});
//
} else
dataSourceDtoList
.
add
(
z
.
getItem2
());
});
cellDataDto
.
setDataSourceList
(
dataSourceDtoList
);
...
...
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