Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
W
workflow-platform
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
赵啸非
workflow-platform
Commits
49088a1f
Commit
49088a1f
authored
Jun 01, 2025
by
赵啸非
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修改部分pom
parent
a5c60fbb
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
7 additions
and
2 deletions
+7
-2
common-lib/src/main/java/com/mortals/xhx/common/pdu/flow/FlowTaskPdu.java
...ain/java/com/mortals/xhx/common/pdu/flow/FlowTaskPdu.java
+4
-0
workflow-engine/src/main/java/com/mortals/flowable/service/FlowTaskServiceImpl.java
...ava/com/mortals/flowable/service/FlowTaskServiceImpl.java
+3
-2
No files found.
common-lib/src/main/java/com/mortals/xhx/common/pdu/flow/FlowTaskPdu.java
View file @
49088a1f
...
@@ -110,6 +110,10 @@ public class FlowTaskPdu implements Serializable {
...
@@ -110,6 +110,10 @@ public class FlowTaskPdu implements Serializable {
@ApiModelProperty
(
"附件信息"
)
@ApiModelProperty
(
"附件信息"
)
private
List
<
AttachmentEntity
>
attachmentList
;
private
List
<
AttachmentEntity
>
attachmentList
;
/**
* 任务类型
*/
private
String
type
;
private
String
action
;
private
String
action
;
...
...
workflow-engine/src/main/java/com/mortals/flowable/service/FlowTaskServiceImpl.java
View file @
49088a1f
...
@@ -443,6 +443,7 @@ public class FlowTaskServiceImpl extends FlowServiceFactory implements IApiFlowT
...
@@ -443,6 +443,7 @@ public class FlowTaskServiceImpl extends FlowServiceFactory implements IApiFlowT
CommentInfoEntity
commentInfoEntity
=
commentInfoService
.
selectOne
(
commentInfoQuery
);
CommentInfoEntity
commentInfoEntity
=
commentInfoService
.
selectOne
(
commentInfoQuery
);
if
(!
ObjectUtils
.
isEmpty
(
commentInfoEntity
))
{
if
(!
ObjectUtils
.
isEmpty
(
commentInfoEntity
))
{
flowTask
.
setAction
(
commentInfoEntity
.
getAction
());
//flowTask.setAction();
flowTask
.
setAction
(
commentInfoEntity
.
getAction
());
//flowTask.setAction();
flowTask
.
setType
(
commentInfoEntity
.
getType
());
}
}
buildPerson
(
histIns
.
getTaskId
(),
flowTask
);
buildPerson
(
histIns
.
getTaskId
(),
flowTask
);
...
@@ -467,6 +468,8 @@ public class FlowTaskServiceImpl extends FlowServiceFactory implements IApiFlowT
...
@@ -467,6 +468,8 @@ public class FlowTaskServiceImpl extends FlowServiceFactory implements IApiFlowT
hisFlowList
.
add
(
flowTask
);
hisFlowList
.
add
(
flowTask
);
}
}
//查询当前任务是否存在子任务
//查询当前任务是否存在子任务
List
<
HistoricTaskInstance
>
subList
=
historyService
.
createHistoricTaskInstanceQuery
()
List
<
HistoricTaskInstance
>
subList
=
historyService
.
createHistoricTaskInstanceQuery
()
.
taskParentTaskId
(
histIns
.
getTaskId
())
.
taskParentTaskId
(
histIns
.
getTaskId
())
...
@@ -635,8 +638,6 @@ public class FlowTaskServiceImpl extends FlowServiceFactory implements IApiFlowT
...
@@ -635,8 +638,6 @@ public class FlowTaskServiceImpl extends FlowServiceFactory implements IApiFlowT
if
(
"true"
.
equals
(
bool
))
{
if
(
"true"
.
equals
(
bool
))
{
taskService
.
addComment
(
completeTaskReq
.
getTaskId
(),
taskEntity
.
getProcessInstanceId
(),
FlowComment
.
NORMAL
.
getType
(),
completeTaskReq
.
getMessage
());
taskService
.
addComment
(
completeTaskReq
.
getTaskId
(),
taskEntity
.
getProcessInstanceId
(),
FlowComment
.
NORMAL
.
getType
(),
completeTaskReq
.
getMessage
());
completeTaskReq
.
setAction
(
FlowComment
.
NORMAL
.
getType
());
completeTaskReq
.
setAction
(
FlowComment
.
NORMAL
.
getType
());
}
else
{
}
else
{
taskService
.
addComment
(
completeTaskReq
.
getTaskId
(),
taskEntity
.
getProcessInstanceId
(),
FlowComment
.
REJECT
.
getType
(),
completeTaskReq
.
getMessage
());
taskService
.
addComment
(
completeTaskReq
.
getTaskId
(),
taskEntity
.
getProcessInstanceId
(),
FlowComment
.
REJECT
.
getType
(),
completeTaskReq
.
getMessage
());
completeTaskReq
.
setAction
(
FlowComment
.
REJECT
.
getType
());
completeTaskReq
.
setAction
(
FlowComment
.
REJECT
.
getType
());
...
...
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