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
329a29b8
Commit
329a29b8
authored
Nov 14, 2018
by
neo
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
[Bugfix] fixed error jobstatus field name
parent
6b991acf
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
5 additions
and
5 deletions
+5
-5
PeriodJobDto.java
...c/main/java/pwc/taxtech/atms/dto/vatdto/PeriodJobDto.java
+5
-5
No files found.
atms-api/src/main/java/pwc/taxtech/atms/dto/vatdto/PeriodJobDto.java
View file @
329a29b8
...
...
@@ -26,7 +26,7 @@ public class PeriodJobDto {
private
String
status
;
private
String
errorMsg
;
private
String
jo
t
Status
;
private
String
jo
b
Status
;
public
PeriodJobDto
copyFromPeriodJob
(
PeriodJob
job
)
{
this
.
id
=
job
.
getId
();
...
...
@@ -40,15 +40,15 @@ public class PeriodJobDto {
this
.
errorMsg
=
job
.
getErrorMsg
();
MyAsserts
.
assertNotEmpty
(
stepsCode
,
Exceptions
.
SERVER_ERROR_EXCEPTION
);
if
(
StringUtils
.
isBlank
(
status
))
this
.
jo
t
Status
=
STATUS_BEGIN
;
if
(
StringUtils
.
isBlank
(
status
))
this
.
jo
b
Status
=
STATUS_BEGIN
;
else
{
List
<
WrapPeriodJobDto
.
Task
>
tasks
=
WrapPeriodJobDto
.
fromJson
(
status
);
if
(
Collections
.
isEmpty
(
tasks
))
this
.
jo
t
Status
=
STATUS_BEGIN
;
if
(
Collections
.
isEmpty
(
tasks
))
this
.
jo
b
Status
=
STATUS_BEGIN
;
else
{
String
[]
codes
=
stepsCode
.
split
(
","
);
if
(
tasks
.
size
()
<
codes
.
length
)
this
.
jo
t
Status
=
STATUS_RUNNING
;
if
(
tasks
.
size
()
<
codes
.
length
)
this
.
jo
b
Status
=
STATUS_RUNNING
;
else
{
this
.
jo
t
Status
=
tasks
.
stream
().
anyMatch
(
m
->
m
.
status
.
equals
(
STATUS_ERROR
))
?
STATUS_ERROR
:
STATUS_END
;
this
.
jo
b
Status
=
tasks
.
stream
().
anyMatch
(
m
->
m
.
status
.
equals
(
STATUS_ERROR
))
?
STATUS_ERROR
:
STATUS_END
;
}
}
}
...
...
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