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
2948f07a
Commit
2948f07a
authored
Aug 24, 2018
by
neo
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
[dev] bb prarameter index reduce 1
parent
5d1f6902
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
3 additions
and
3 deletions
+3
-3
ReportCellDataSourceDto.java
.../pwc/taxtech/atms/dto/vatdto/ReportCellDataSourceDto.java
+2
-2
BB.java
...wc/taxtech/atms/vat/service/impl/report/functions/BB.java
+1
-1
No files found.
atms-api/src/main/java/pwc/taxtech/atms/dto/vatdto/ReportCellDataSourceDto.java
View file @
2948f07a
...
...
@@ -42,9 +42,9 @@ public class ReportCellDataSourceDto extends FormulaDataSourceDto {
dataSource
.
name
=
DataSourceName
.
ReportDataSource
;
dataSource
.
year
=
currentPeriodBo
.
curYear
;
dataSource
.
period
=
currentPeriodBo
.
curPeriod
;
dataSource
.
columnIndex
=
bbParasBo
.
getColumnIndex
();
dataSource
.
columnIndex
=
bbParasBo
.
getColumnIndex
()
-
1
;
dataSource
.
columnName
=
cellTemplateData
.
getColumnName
();
dataSource
.
rowIndex
=
bbParasBo
.
getRowIndex
();
dataSource
.
rowIndex
=
bbParasBo
.
getRowIndex
()
-
1
;
dataSource
.
rowName
=
cellTemplateData
.
getRowName
();
dataSource
.
reportTemplateID
=
cellTemplateData
.
getReportTemplateID
();
dataSource
.
cellDataID
=
cellData
.
getId
()
+
""
;
...
...
atms-api/src/main/java/pwc/taxtech/atms/vat/service/impl/report/functions/BB.java
View file @
2948f07a
...
...
@@ -140,7 +140,7 @@ public class BB extends FunctionBase implements FreeRefFunction {
}
finally
{
LOGGER
.
warn
(
"error for bb cacls for {} and current for {}"
,
bo
.
toString
(),
curPeriod
.
toString
());
Long
dataSourceID
=
saveDataSource
(
ec
,
ds
,
FormulaDataSourceDetailType
.
ReportCellDataSourceDto
,
cellValue
,
formulaContext
.
getPeriod
(),
formulaContext
.
getReportTemplateGroupID
(),
bo
.
getColumnIndex
()
,
bo
.
getRowIndex
()
);
cellValue
,
formulaContext
.
getPeriod
(),
formulaContext
.
getReportTemplateGroupID
(),
bo
.
getColumnIndex
()
-
1
,
bo
.
getRowIndex
()-
1
);
saveFormulaBlock
(
formulaContext
.
getPeriod
(),
ec
,
bo
.
expression
(
curPeriod
.
getCurPeriod
(),
curPeriod
.
getCurYear
()),
cellValue
,
dataSourceID
);
}
}
...
...
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