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
533b0353
Commit
533b0353
authored
Nov 17, 2018
by
neo
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
[Bugfix] fixed bb expression use bb not pct
parent
75d1ddde
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
1 addition
and
15 deletions
+1
-15
BBParasBo.java
.../src/main/java/pwc/taxtech/atms/dto/vatdto/BBParasBo.java
+0
-14
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/BBParasBo.java
View file @
533b0353
...
...
@@ -118,20 +118,6 @@ public class BBParasBo {
return
formulaExpression
;
}
public
String
expressionData
()
{
if
(!
expressionData
.
isEmpty
())
{
StringBuilder
builder
=
new
StringBuilder
(
"PCT("
);
for
(
int
i
=
0
;
i
<
expressionData
.
size
();
i
++)
{
builder
.
append
(
expressionData
.
get
(
i
).
toString
());
if
(
i
<
expressionData
.
size
()
-
1
)
builder
.
append
(
","
);
}
builder
.
append
(
")"
);
return
builder
.
toString
();
}
return
"0"
;
}
@Override
public
String
toString
()
{
return
"BBParasBo{"
+
...
...
atms-api/src/main/java/pwc/taxtech/atms/vat/service/impl/report/functions/BB.java
View file @
533b0353
...
...
@@ -160,7 +160,7 @@ public class BB extends FunctionBase implements FreeRefFunction {
formulaContext
.
getReportTemplateGroupId
(),
bo
.
getColumnIndex
()
-
1
,
bo
.
getRowIndex
()
-
1
,
formulaContext
.
getProjectId
());
saveFormulaBlock
(
formulaContext
.
getPeriod
(),
ec
,
bo
.
expression
(),
bo
.
expression
Data
(),
dataSourceId
,
formulaContext
.
getProjectId
());
bo
.
expression
(),
bo
.
expression
(),
dataSourceId
,
formulaContext
.
getProjectId
());
}
}
}
...
...
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