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
af74bb1e
Commit
af74bb1e
authored
Mar 29, 2019
by
chase
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fixbug
parent
13c71b3b
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
4 additions
and
4 deletions
+4
-4
WPTYPE.java
...axtech/atms/vat/service/impl/report/functions/WPTYPE.java
+4
-4
No files found.
atms-api/src/main/java/pwc/taxtech/atms/vat/service/impl/report/functions/WPTYPE.java
View file @
af74bb1e
...
@@ -54,10 +54,10 @@ public class WPTYPE extends FunctionBase implements FreeRefFunction {
...
@@ -54,10 +54,10 @@ public class WPTYPE extends FunctionBase implements FreeRefFunction {
cellTemplateDataList
=
agent
.
getCellTemplateByTypeAndIndex
(
formulaContext
.
getReportTemplateGroupId
(),
cellTemplateDataList
=
agent
.
getCellTemplateByTypeAndIndex
(
formulaContext
.
getReportTemplateGroupId
(),
formulaContext
.
getProjectId
(),
bo
.
getReportCode
(),
bo
.
getRowColumnIndex
()
-
1
,
bo
.
getTaxRate
(),
bo
.
getRevenueType
(),
bo
.
getTaxType
(),
bo
.
getColumnIndex
()
-
1
,
formulaContext
.
getProjectId
(),
bo
.
getReportCode
(),
bo
.
getRowColumnIndex
()
-
1
,
bo
.
getTaxRate
(),
bo
.
getRevenueType
(),
bo
.
getTaxType
(),
bo
.
getColumnIndex
()
-
1
,
formulaContext
.
getPeriod
(),
formulaContext
.
getOrganizationId
(),
queryDate
,
queryDate
);
formulaContext
.
getPeriod
(),
formulaContext
.
getOrganizationId
(),
queryDate
,
queryDate
);
if
(
CollectionUtils
.
isEmpty
(
cellTemplateDataList
)){
//
if(CollectionUtils.isEmpty(cellTemplateDataList)){
cellTemplateDataList
=
agent
.
getCellTemplateGroupDto
(
formulaContext
.
getReportTemplateGroupId
(),
//
cellTemplateDataList = agent.getCellTemplateGroupDto(formulaContext.getReportTemplateGroupId(),
formulaContext
.
getProjectId
(),
bo
.
getReportCode
(),
ec
.
getRowIndex
(),
ec
.
getColumnIndex
(),
formulaContext
.
getPeriod
());
//
formulaContext.getProjectId(), bo.getReportCode(), ec.getRowIndex(), ec.getColumnIndex(), formulaContext.getPeriod());
}
//
}
// MyAsserts.assertNotEmpty(cellTemplateDataList, Exceptions.BB_CELL_TEMP_NULL);
// MyAsserts.assertNotEmpty(cellTemplateDataList, Exceptions.BB_CELL_TEMP_NULL);
if
(
CollectionUtils
.
isEmpty
(
cellTemplateDataList
)){
if
(
CollectionUtils
.
isEmpty
(
cellTemplateDataList
)){
return
cellValue
;
return
cellValue
;
...
...
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