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
638cefca
Commit
638cefca
authored
May 16, 2019
by
chase
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix tbm公式无数据时显示不对bug
parent
abf857d5
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
2 additions
and
6 deletions
+2
-6
TBM.java
...c/taxtech/atms/vat/service/impl/report/functions/TBM.java
+2
-6
No files found.
atms-api/src/main/java/pwc/taxtech/atms/vat/service/impl/report/functions/TBM.java
View file @
638cefca
...
...
@@ -42,19 +42,15 @@ public class TBM extends FunctionBase implements FreeRefFunction {
List
<
ReportCellDataSourceDto
>
dataSource
=
Lists
.
newArrayList
();
List
<
String
>
segment3List
=
getSegment3List
(
evenType
,
mappingName
);
if
(
CollectionUtils
.
isEmpty
(
segment3List
))
{
return
NumberEval
.
ZERO
;
}
double
result
=
0.00
;
if
(
CollectionUtils
.
isNotEmpty
(
segment3List
))
{
if
(
sourceDataType
==
1
)
{
result
=
countForTrialBalance
(
evenType
,
calculateType
,
segment3List
,
dataSource
,
formulaContext
.
getPeriod
(),
formulaContext
.
getYear
(),
formulaContext
.
getOrganizationId
());
}
else
if
(
sourceDataType
==
2
)
{
result
=
countForAdjBalance
(
evenType
,
calculateType
,
segment3List
,
dataSource
,
formulaContext
.
getPeriod
(),
formulaContext
.
getYear
(),
formulaContext
.
getOrganizationId
());
}
else
if
(
sourceDataType
==
3
)
{
result
=
countForTrialFinalBalance
(
evenType
,
calculateType
,
segment3List
,
dataSource
,
formulaContext
.
getPeriod
(),
formulaContext
.
getYear
(),
formulaContext
.
getOrganizationId
());
}
else
{
return
NumberEval
.
ZERO
;
}
}
Long
dataSoureId
=
saveDataSource
(
ec
,
Collections
.
singletonList
(
dataSource
),
FormulaDataSourceDetailType
.
FormulaDataSourceDto
,
...
...
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