Skip to content

T
traffic-front
Commit c022969c authored by neo.wang's avatar neo.wang
Browse files
Options

Merge branch 'dev_neo3' into 'dev' 

[revert] revert change bb item to single ds

See merge request root/atms!107
parents 7bf9f064 c964b9f4
Hide whitespace changes
Inline Side-by-side
Showing with 6 additions and 6 deletions
atms-api/src/main/java/pwc/taxtech/atms/vat/service/impl/ReportServiceImpl.java
View file @ c022969c
...@@ -540,12 +540,12 @@ public class ReportServiceImpl extends VatAbstractService implements ReportServi ...@@ -540,12 +540,12 @@ public class ReportServiceImpl extends VatAbstractService implements ReportServi
.filter(y -> y.getItem1().equals(a.getCellTemplateID())).collect(Collectors.toList()); .filter(y -> y.getItem1().equals(a.getCellTemplateID())).collect(Collectors.toList());
List<DataSourceDto> dataSourceDtoList = new ArrayList<>(); List<DataSourceDto> dataSourceDtoList = new ArrayList<>();
entryList.forEach(z -> { entryList.forEach(z -> {
if (z.getItem2().getItems() != null && !z.getItem2().getItems().isEmpty() && z.getItem2().getItems().get(0).contains("tag")) { // if (z.getItem2().getItems() != null && !z.getItem2().getItems().isEmpty() && z.getItem2().getItems().get(0).contains("tag")) {
z.getItem2().getItems().forEach(m -> { // z.getItem2().getItems().forEach(m -> {
ReportCellDataSourceDto dto = JSON.parseObject(m, ReportCellDataSourceDto.class); // ReportCellDataSourceDto dto = JSON.parseObject(m, ReportCellDataSourceDto.class);
dataSourceDtoList.add(dto); // dataSourceDtoList.add(dto);
}); // });
} else // } else
dataSourceDtoList.add(z.getItem2()); dataSourceDtoList.add(z.getItem2());
}); });
cellDataDto.setDataSourceList(dataSourceDtoList); cellDataDto.setDataSourceList(dataSourceDtoList);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment