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
1dd60d1b
Commit
1dd60d1b
authored
Jan 17, 2024
by
caotao
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
移除调用工作流时的异常捕获语句
parent
e7d8958e
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
27 additions
and
37 deletions
+27
-37
JgChangeRegistrationReformServiceImpl.java
...z/service/impl/JgChangeRegistrationReformServiceImpl.java
+27
-37
No files found.
amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/service/impl/JgChangeRegistrationReformServiceImpl.java
View file @
1dd60d1b
...
...
@@ -234,21 +234,17 @@ public class JgChangeRegistrationReformServiceImpl extends BaseService<JgChangeR
public
ProcessTaskDTO
startByVariable
(
JgChangeRegistrationReform
jgChangeRegistrationReform
)
{
ProcessTaskDTO
processTaskDTO
=
new
ProcessTaskDTO
();
//启动流程
try
{
ActWorkflowStartDTO
dto
=
new
ActWorkflowStartDTO
();
dto
.
setProcessDefinitionKey
(
"renovationRegistrationReviewNew"
);
dto
.
setBusinessKey
(
"submit"
);
dto
.
setCompleteFirstTask
(
Boolean
.
TRUE
);
dto
.
setNextExecuteUserCompanyCode
(
jgChangeRegistrationReform
.
getReceiveOrgCode
());
List
<
ActWorkflowStartDTO
>
actWorkflowStartDTOList
=
Arrays
.
asList
(
dto
);
ActWorkflowBatchDTO
actWorkflowBatchDTO
=
new
ActWorkflowBatchDTO
();
actWorkflowBatchDTO
.
setProcess
(
actWorkflowStartDTOList
);
List
<
ProcessTaskDTO
>
result
=
iCmWorkflowService
.
startBatch
(
actWorkflowBatchDTO
);
if
(!
result
.
isEmpty
())
{
processTaskDTO
=
result
.
get
(
0
);
}
}
catch
(
Exception
e
)
{
e
.
printStackTrace
();
ActWorkflowStartDTO
dto
=
new
ActWorkflowStartDTO
();
dto
.
setProcessDefinitionKey
(
"renovationRegistrationReviewNew"
);
dto
.
setBusinessKey
(
"submit"
);
dto
.
setCompleteFirstTask
(
Boolean
.
TRUE
);
dto
.
setNextExecuteUserCompanyCode
(
jgChangeRegistrationReform
.
getReceiveOrgCode
());
List
<
ActWorkflowStartDTO
>
actWorkflowStartDTOList
=
Arrays
.
asList
(
dto
);
ActWorkflowBatchDTO
actWorkflowBatchDTO
=
new
ActWorkflowBatchDTO
();
actWorkflowBatchDTO
.
setProcess
(
actWorkflowStartDTOList
);
List
<
ProcessTaskDTO
>
result
=
iCmWorkflowService
.
startBatch
(
actWorkflowBatchDTO
);
if
(!
result
.
isEmpty
())
{
processTaskDTO
=
result
.
get
(
0
);
}
return
processTaskDTO
;
}
...
...
@@ -342,28 +338,22 @@ public class JgChangeRegistrationReformServiceImpl extends BaseService<JgChangeR
public
void
flowExecute
(
Long
id
,
String
instanceId
,
String
operate
,
String
comment
)
{
ProcessTaskDTO
processTaskDTO
=
new
ProcessTaskDTO
();
JgChangeRegistrationReform
jgChangeRegistrationReform
=
this
.
getBaseMapper
().
selectById
(
id
);
try
{
// JSONObject task = workFlowFeginService.getTaskNoAuth(instanceId);
// JSONObject taskMessage = JSON.parseObject(JSON.toJSONString(task.get("data")));
String
taskId
=
jgChangeRegistrationReform
.
getNextTaskId
();
//组装信息
TaskResultDTO
dto
=
new
TaskResultDTO
();
dto
.
setResultCode
(
"approvalStatus"
);
dto
.
setTaskId
(
taskId
);
dto
.
setComment
(
comment
);
HashMap
<
String
,
Object
>
map
=
new
HashMap
<>();
map
.
put
(
"approvalStatus"
,
operate
);
//2023年12月27日16点33分 流程状态为起草人撤回或者一级审批驳回时需要将提交时的已同意修改为已提交
if
(!
ObjectUtils
.
isEmpty
(
jgChangeRegistrationReform
)
&&
(
jgChangeRegistrationReform
.
getStatus
().
equals
(
WorkFlowStatusEnum
.
CHANGE_SUBMIT
.
getRollBack
())
||
jgChangeRegistrationReform
.
getStatus
().
equals
(
WorkFlowStatusEnum
.
CHANGE_SUBMIT
.
getReject
())))
{
map
.
put
(
"approvalStatus"
,
"提交"
);
}
dto
.
setVariable
(
map
);
dto
.
setNextExecuteUserCompanyCode
(
getNextUserOrgCode
(
operate
,
jgChangeRegistrationReform
));
//执行流程
processTaskDTO
=
iCmWorkflowService
.
complete
(
taskId
,
dto
);
}
catch
(
Exception
e
)
{
e
.
printStackTrace
();
}
String
taskId
=
jgChangeRegistrationReform
.
getNextTaskId
();
//组装信息
TaskResultDTO
dto
=
new
TaskResultDTO
();
dto
.
setResultCode
(
"approvalStatus"
);
dto
.
setTaskId
(
taskId
);
dto
.
setComment
(
comment
);
HashMap
<
String
,
Object
>
map
=
new
HashMap
<>();
map
.
put
(
"approvalStatus"
,
operate
);
//2023年12月27日16点33分 流程状态为起草人撤回或者一级审批驳回时需要将提交时的已同意修改为已提交
if
(!
ObjectUtils
.
isEmpty
(
jgChangeRegistrationReform
)
&&
(
jgChangeRegistrationReform
.
getStatus
().
equals
(
WorkFlowStatusEnum
.
CHANGE_SUBMIT
.
getRollBack
())
||
jgChangeRegistrationReform
.
getStatus
().
equals
(
WorkFlowStatusEnum
.
CHANGE_SUBMIT
.
getReject
())))
{
map
.
put
(
"approvalStatus"
,
"提交"
);
}
dto
.
setVariable
(
map
);
dto
.
setNextExecuteUserCompanyCode
(
getNextUserOrgCode
(
operate
,
jgChangeRegistrationReform
));
//执行流程
processTaskDTO
=
iCmWorkflowService
.
complete
(
taskId
,
dto
);
// 更新下一步执行人
updateExecuteIds
(
instanceId
,
jgChangeRegistrationReform
,
operate
,
processTaskDTO
);
...
...
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