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
d060cf3e
Commit
d060cf3e
authored
Oct 19, 2018
by
neo
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
[dev] fixed commited and decided is not requre temp
parent
f81068b9
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
6 additions
and
5 deletions
+6
-5
ApprovalController.java
.../java/pwc/taxtech/atms/controller/ApprovalController.java
+6
-5
No files found.
atms-api/src/main/java/pwc/taxtech/atms/controller/ApprovalController.java
View file @
d060cf3e
...
...
@@ -62,16 +62,17 @@ public class ApprovalController {
@ResponseBody
@RequestMapping
(
value
=
"/check/{taskId}"
)
public
String
check
(
@PathVariable
String
taskId
,
@RequestParam
Integer
committed
,
@RequestParam
Integer
decide
)
{
public
String
check
(
@PathVariable
String
taskId
,
@RequestParam
(
required
=
false
)
Integer
committed
,
@RequestParam
(
required
=
false
)
Integer
decide
)
{
Map
<
String
,
Object
>
map
=
new
HashMap
<>();
if
(
committed
!=
null
)
{
if
(
committed
!=
null
&&
(
committed
==
0
||
committed
==
1
)
)
{
map
.
put
(
"committed"
,
committed
);
taskService
.
complete
(
taskId
,
map
);
if
(
committed
==
1
)
mocoHasCommittedAndOver
();
}
else
if
(
decide
!=
null
)
{
if
(
committed
==
1
)
mocoHasCommittedAndOver
();
}
else
if
(
decide
!=
null
&&
(
decide
==
0
||
decide
==
1
)
)
{
map
.
put
(
"decide"
,
decide
);
taskService
.
complete
(
taskId
,
map
);
if
(
decide
==
1
)
mocoAggreAndOver
();
if
(
decide
==
1
)
mocoAggreAndOver
();
else
mocoDisAggreAndOver
();
}
return
taskId
;
...
...
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