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
56afeb8e
Commit
56afeb8e
authored
Nov 12, 2018
by
neo
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
[Bugfix] fixed approval use instacneId not taskid
parent
bff27b8c
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
15 additions
and
3 deletions
+15
-3
ApprovalService.java
...va/pwc/taxtech/atms/vat/service/impl/ApprovalService.java
+15
-3
No files found.
atms-api/src/main/java/pwc/taxtech/atms/vat/service/impl/ApprovalService.java
View file @
56afeb8e
...
@@ -125,7 +125,7 @@ public class ApprovalService {
...
@@ -125,7 +125,7 @@ public class ApprovalService {
@Transactional
@Transactional
public
void
checkTask
(
String
task
Id
,
String
decide
,
String
comment
)
{
public
void
checkTask
(
String
instance
Id
,
String
decide
,
String
comment
)
{
Map
<
String
,
Object
>
map
=
new
HashMap
<>();
Map
<
String
,
Object
>
map
=
new
HashMap
<>();
PeriodApprove
pa
=
new
PeriodApprove
();
PeriodApprove
pa
=
new
PeriodApprove
();
switch
(
decide
)
{
switch
(
decide
)
{
...
@@ -140,10 +140,16 @@ public class ApprovalService {
...
@@ -140,10 +140,16 @@ public class ApprovalService {
default
:
default
:
throw
new
BadParameterException
(
"not support decide param type"
);
throw
new
BadParameterException
(
"not support decide param type"
);
}
}
List
<
Attachment
>
attachments
=
taskService
.
getTaskAttachments
(
taskId
);
List
<
Task
>
tasks
=
taskService
.
createTaskQuery
().
taskAssignee
(
Constant
.
ASSIGNEE_MANAGER
).
processInstanceId
(
instanceId
).
list
();
if
(
tasks
!=
null
&&
tasks
.
size
()
==
1
)
{
Task
task
=
tasks
.
get
(
0
);
List
<
Attachment
>
attachments
=
taskService
.
getTaskAttachments
(
task
.
getId
());
if
(
attachments
!=
null
&&
attachments
.
size
()
==
1
)
{
if
(
attachments
!=
null
&&
attachments
.
size
()
==
1
)
{
String
uuid
=
attachments
.
get
(
0
).
getDescription
();
String
uuid
=
attachments
.
get
(
0
).
getDescription
();
taskService
.
complete
(
taskId
,
map
);
taskService
.
complete
(
task
.
getId
()
,
map
);
pa
.
setId
(
uuid
);
pa
.
setId
(
uuid
);
periodApproveMapper
.
updateByPrimaryKeySelective
(
pa
);
periodApproveMapper
.
updateByPrimaryKeySelective
(
pa
);
...
@@ -155,6 +161,12 @@ public class ApprovalService {
...
@@ -155,6 +161,12 @@ public class ApprovalService {
logger
.
warn
(
"task must not null or size gt 1"
);
logger
.
warn
(
"task must not null or size gt 1"
);
}
}
}
else
{
logger
.
warn
(
"task must not null or size eq 1"
);
}
}
}
...
...
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