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
2e10d975
Commit
2e10d975
authored
Oct 24, 2018
by
neo
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
[bugfix] fix bb foumula set parsedFormual
parent
c81e0a77
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
3 additions
and
2 deletions
+3
-2
ReportGeneratorImpl.java
...wc/taxtech/atms/vat/service/impl/ReportGeneratorImpl.java
+3
-2
No files found.
atms-api/src/main/java/pwc/taxtech/atms/vat/service/impl/ReportGeneratorImpl.java
View file @
2e10d975
...
@@ -289,9 +289,10 @@ public class ReportGeneratorImpl {
...
@@ -289,9 +289,10 @@ public class ReportGeneratorImpl {
}
}
//如果有正则匹配就进行更新公式解析
//如果有正则匹配就进行更新公式解析
if
(
isFind
&&
!
periodCellTemplateConfig
.
getFormula
().
contains
(
"BB"
)
)
{
if
(
isFind
)
{
periodCellTemplateConfig
.
setParsedFormula
(
StringUtils
.
isNotBlank
(
resultFormula
)
?
resultFormula
:
null
);
periodCellTemplateConfig
.
setParsedFormula
(
StringUtils
.
isNotBlank
(
resultFormula
)
?
resultFormula
:
null
);
periodCellTemplateConfig
.
setFormula
(
StringUtils
.
isNotBlank
(
periodCellTemplateConfig
.
getFormula
())
?
resultFormula
:
null
);
if
(
periodCellTemplateConfig
.
getFormula
()
!=
null
&&
!
periodCellTemplateConfig
.
getFormula
().
contains
(
"BB("
))
periodCellTemplateConfig
.
setFormula
(
StringUtils
.
isNotBlank
(
periodCellTemplateConfig
.
getFormula
())
?
resultFormula
:
null
);
periodCellTemplateConfigMapper
.
updateByPrimaryKeySelective
(
periodCellTemplateConfig
);
periodCellTemplateConfigMapper
.
updateByPrimaryKeySelective
(
periodCellTemplateConfig
);
}
}
...
...
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