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
3a4c3c35
Commit
3a4c3c35
authored
Nov 13, 2018
by
neo
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
[bugfix] fixed js intervel cannot close when error
parent
8ff3192f
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
5 additions
and
1 deletion
+5
-1
ReportGeneratorImpl.java
...wc/taxtech/atms/vat/service/impl/ReportGeneratorImpl.java
+1
-0
vat-caculate-data.ctrl.js
...vat/reduction/vat-caculate-data/vat-caculate-data.ctrl.js
+4
-1
No files found.
atms-api/src/main/java/pwc/taxtech/atms/vat/service/impl/ReportGeneratorImpl.java
View file @
3a4c3c35
...
...
@@ -454,6 +454,7 @@ public class ReportGeneratorImpl {
List
<
PeriodCellTemplate
>
tempPeriodCellTemplateList
=
resources
.
getPeriodCellTemplates
().
stream
()
.
filter
(
a
->
a
.
getReportTemplateId
().
equals
(
templateId
))
.
collect
(
Collectors
.
toList
());
tempPeriodCellTemplateList
.
forEach
(
a
->
{
Optional
<
PeriodCellTemplateConfig
>
tempCellTemplateConfig
=
resources
.
getPeriodCellTemplateConfigs
().
stream
()
.
filter
(
item
->
item
.
getCellTemplateId
().
equals
(
a
.
getCellTemplateId
())
...
...
atms-web/src/main/webapp/app/vat/reduction/vat-caculate-data/vat-caculate-data.ctrl.js
View file @
3a4c3c35
...
...
@@ -587,10 +587,13 @@
updateTasksStatus
(
result
.
data
);
if
(
result
.
data
.
status
==
'Begin'
){
$scope
.
timer
=
$interval
(
function
(){
vatReportService
.
getJobStatus
(
vatSessionService
.
project
.
id
,
vatSessionService
.
month
,
result
.
data
.
id
).
then
(
function
(
result
){
vatReportService
.
getJobStatus
(
vatSessionService
.
project
.
id
,
vatSessionService
.
month
,
result
.
data
.
id
)
.
success
(
function
(
result
){
if
(
result
.
data
&&
result
.
status
==
200
){
updateTasksStatus
(
result
.
data
);
}
}).
error
(
function
(
result
){
$interval
.
cancel
(
$scope
.
timer
);
});
},
1000
);
...
...
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