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
0f0719ea
Commit
0f0719ea
authored
Mar 25, 2019
by
chase
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix bug
parent
0e4ea1b4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
6 additions
and
3 deletions
+6
-3
DFFS.java
.../taxtech/atms/vat/service/impl/report/functions/DFFS.java
+1
-1
JFFS.java
.../taxtech/atms/vat/service/impl/report/functions/JFFS.java
+1
-1
app.json
atms-web/src/main/webapp/app-resources/i18n/en-us/app.json
+2
-0
app.json
atms-web/src/main/webapp/app-resources/i18n/zh-CN/app.json
+2
-1
No files found.
atms-api/src/main/java/pwc/taxtech/atms/vat/service/impl/report/functions/DFFS.java
View file @
0f0719ea
...
...
@@ -41,7 +41,7 @@ public class DFFS extends FunctionBase implements FreeRefFunction {
segment5
=
getStringParam
(
args
[
4
],
ec
);
//利润中心代码
}
String
segment6
=
null
;
if
(!(
args
[
4
]
instanceof
MissingArgEval
)){
if
(!(
args
[
5
]
instanceof
MissingArgEval
)){
segment6
=
getStringParam
(
args
[
5
],
ec
);
//产品代码
}
String
formulaExpression
=
"DFFS(\""
+
code
+
"\","
+
year
+
","
+
period
+
","
...
...
atms-api/src/main/java/pwc/taxtech/atms/vat/service/impl/report/functions/JFFS.java
View file @
0f0719ea
...
...
@@ -41,7 +41,7 @@ public class JFFS extends FunctionBase implements FreeRefFunction {
segment5
=
getStringParam
(
args
[
4
],
ec
);
//利润中心代码
}
String
segment6
=
null
;
if
(!(
args
[
4
]
instanceof
MissingArgEval
)){
if
(!(
args
[
5
]
instanceof
MissingArgEval
)){
segment6
=
getStringParam
(
args
[
5
],
ec
);
//产品代码
}
...
...
atms-web/src/main/webapp/app-resources/i18n/en-us/app.json
View file @
0f0719ea
...
...
@@ -850,5 +850,7 @@
"TBEBITForm"
:
"TB EBIT Form"
,
"ClickEnsureTip"
:
"Click Ensure Button!"
,
"ConditionColumnNum"
:
"Search Condition Column Num"
,
"Condition"
:
"Search Condition"
,
"RevenueTypeConfiguration"
:
"Revenue Type Config"
}
atms-web/src/main/webapp/app-resources/i18n/zh-CN/app.json
View file @
0f0719ea
...
...
@@ -909,6 +909,7 @@
"true"
:
"是"
,
"false"
:
"否"
,
"ConditionColumnNum"
:
"条件列"
,
"Condition"
:
"查询条件"
,
"~MustBeEndOneApp"
:
"I Must be the End One, please!"
}
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