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
961aa756
Commit
961aa756
authored
Nov 01, 2018
by
neo
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
[BugFix] fixed bb formulate cannot xianshi
parent
4ceb93c1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
2 additions
and
2 deletions
+2
-2
ReportGeneratorImpl.java
...wc/taxtech/atms/vat/service/impl/ReportGeneratorImpl.java
+2
-2
No files found.
atms-api/src/main/java/pwc/taxtech/atms/vat/service/impl/ReportGeneratorImpl.java
View file @
961aa756
...
...
@@ -527,7 +527,7 @@ public class ReportGeneratorImpl {
List
<
CellCalcInfoDto
>
cellCalcInfoDtos
=
new
ArrayList
<>();
Map
<
String
,
List
<
PeriodCellTemplateConfigExtendDto
>>
myStream
=
new
HashMap
<>();
for
(
PeriodCellTemplateConfigExtendDto
pctce
:
periodCellTemplateConfigExtendDtos
)
{
String
key
=
pctce
.
getRowIndex
()
+
"_"
+
pctce
.
getColumnIndex
()
+
"_"
+
pctce
.
getReportTemplateI
D
();
String
key
=
pctce
.
getRowIndex
()
+
"_"
+
pctce
.
getColumnIndex
()
+
"_"
+
pctce
.
getReportTemplateI
d
();
if
(!
myStream
.
containsKey
(
key
))
myStream
.
put
(
key
,
new
ArrayList
<>());
myStream
.
get
(
key
).
add
(
pctce
);
}
...
...
@@ -544,7 +544,7 @@ public class ReportGeneratorImpl {
cellCalcInfoDto
.
setParsedFormula
(
convertListToString
(
myStream
.
get
(
m
).
stream
()
.
map
(
PeriodCellTemplateConfig:
:
getParsedFormula
).
collect
(
Collectors
.
toList
())));
//todo: add validation at here later
cellCalcInfoDto
.
setCellTemplateId
(
first
.
getCellTemplateI
D
()
+
""
);
cellCalcInfoDto
.
setCellTemplateId
(
first
.
getCellTemplateI
d
()
+
""
);
cellCalcInfoDto
.
setReportTemplateId
(
first
.
getReportTemplateId
());
cellCalcInfoDto
.
setDataType
(
first
.
getDataType
());
cellCalcInfoDto
.
setIsReadOnly
(
first
.
getReadOnly
());
...
...
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