Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
A
amos-boot-biz
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
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
项目统一框架
amos-boot-biz
Commits
14387160
Commit
14387160
authored
Aug 18, 2021
by
chenhao
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修改完成任務的方法
parent
cd5d1f1a
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
10 additions
and
1 deletion
+10
-1
WorkflowFeignService.java
.../boot/biz/common/workflow/feign/WorkflowFeignService.java
+9
-0
FailureDetailsServiceImpl.java
...le/common/biz/service/impl/FailureDetailsServiceImpl.java
+1
-1
No files found.
amos-boot-biz-common/src/main/java/com/yeejoin/amos/boot/biz/common/workflow/feign/WorkflowFeignService.java
View file @
14387160
...
@@ -94,5 +94,14 @@ public interface WorkflowFeignService {
...
@@ -94,5 +94,14 @@ public interface WorkflowFeignService {
@RequestMapping
(
value
=
"/task/getTaskAssign/{taskId}"
,
method
=
RequestMethod
.
GET
)
@RequestMapping
(
value
=
"/task/getTaskAssign/{taskId}"
,
method
=
RequestMethod
.
GET
)
JSONObject
getTaskAssign
(
@PathVariable
(
"taskId"
)
String
taskId
)
;
JSONObject
getTaskAssign
(
@PathVariable
(
"taskId"
)
String
taskId
)
;
/**
* 不操作FormInstance直接完成任务
* @param taskID
* @param variable
* @return
* @throws Exception
*/
@RequestMapping
(
value
=
"/task/completeTask/noFromInstanceAdd/{taskID}"
,
method
=
RequestMethod
.
POST
)
JSONObject
completeNoExecuteFromInstanceAdd
(
@PathVariable
(
"taskID"
)
String
taskID
,
@RequestBody
(
required
=
false
)
HashMap
<
String
,
Object
>
variable
)
throws
Exception
;
}
}
amos-boot-module/amos-boot-module-biz/amos-boot-module-common-biz/src/main/java/com/yeejoin/amos/boot/module/common/biz/service/impl/FailureDetailsServiceImpl.java
View file @
14387160
...
@@ -344,7 +344,7 @@ public class FailureDetailsServiceImpl extends BaseService<FailureDetailsDto, Fa
...
@@ -344,7 +344,7 @@ public class FailureDetailsServiceImpl extends BaseService<FailureDetailsDto, Fa
Map
<
String
,
Object
>
map
=
checkExcuteTaskAuthMap
(
sequenceNbr
,
userInfo
);
Map
<
String
,
Object
>
map
=
checkExcuteTaskAuthMap
(
sequenceNbr
,
userInfo
);
if
(
Boolean
.
parseBoolean
(
map
.
get
(
"checkFlag"
).
toString
()))
{
if
(
Boolean
.
parseBoolean
(
map
.
get
(
"checkFlag"
).
toString
()))
{
if
(
map
.
get
(
"name"
).
toString
().
startsWith
(
PROCESS_NAME
[
4
]))
{
if
(
map
.
get
(
"name"
).
toString
().
startsWith
(
PROCESS_NAME
[
4
]))
{
workflowFeignService
.
complete
ByVariable
(
map
.
get
(
"taskId"
).
toString
(),
conditionMap
);
workflowFeignService
.
complete
NoExecuteFromInstanceAdd
(
map
.
get
(
"taskId"
).
toString
(),
conditionMap
);
}
else
{
}
else
{
workflowFeignService
.
pickupAndCompleteTask
(
map
.
get
(
"taskId"
).
toString
(),
conditionMap
);
workflowFeignService
.
pickupAndCompleteTask
(
map
.
get
(
"taskId"
).
toString
(),
conditionMap
);
...
...
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