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
8ba11aaa
Commit
8ba11aaa
authored
Mar 13, 2024
by
suhuiguang
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
1.修改bug设备移交选择多个时,创建的待办任务工作流id、任务id不正确导致撤回报错
parent
3a3e8b2a
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
7 additions
and
6 deletions
+7
-6
JgEquipTransferServiceImpl.java
...odule/jg/biz/service/impl/JgEquipTransferServiceImpl.java
+7
-6
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/JgEquipTransferServiceImpl.java
View file @
8ba11aaa
...
...
@@ -14,7 +14,6 @@ import com.yeejoin.amos.boot.biz.common.utils.RedisUtils;
import
com.yeejoin.amos.boot.module.jg.api.dto.*
;
import
com.yeejoin.amos.boot.module.jg.api.entity.JgEquipTransfer
;
import
com.yeejoin.amos.boot.module.jg.api.entity.JgEquipTransferEq
;
import
com.yeejoin.amos.boot.module.jg.api.entity.JgMaintainNotice
;
import
com.yeejoin.amos.boot.module.jg.api.enums.BusinessTypeEnum
;
import
com.yeejoin.amos.boot.module.jg.api.mapper.JgEquipTransferEqMapper
;
import
com.yeejoin.amos.boot.module.jg.api.mapper.JgEquipTransferMapper
;
...
...
@@ -347,7 +346,7 @@ public class JgEquipTransferServiceImpl extends BaseService<JgEquipTransferDto,
// 创建新的代办
this
.
createNewTodo
(
transfer
,
workflowResultDto
,
taskV2Model
,
FlowStatusEnum
.
TO_BE_PROCESSED
);
}
commonService
.
saveExecuteFlowData2Redis
(
transfer
.
getInstanceId
(),
this
.
buildInstanceRuntimeData
(
transfer
));
commonService
.
saveExecuteFlowData2Redis
(
transfer
.
getInstanceId
(),
this
.
buildInstanceRuntimeData
(
transfer
));
}
else
{
JgEquipTransfer
equipTransfer
=
new
JgEquipTransfer
();
BeanUtils
.
copyProperties
(
equipTransferDto
,
equipTransfer
);
...
...
@@ -591,10 +590,12 @@ public class JgEquipTransferServiceImpl extends BaseService<JgEquipTransferDto,
if
(
CollectionUtils
.
isEmpty
(
list
)
||
CollectionUtils
.
isEmpty
(
workflowResultList
))
{
return
;
}
List
<
TaskModelDto
>
taskModelDtoList
=
list
.
stream
().
map
(
item
->
this
.
buildTaskModelDto
(
item
,
workflowResultList
.
get
(
0
))).
collect
(
Collectors
.
toList
());
commonService
.
buildTaskModel
(
taskModelDtoList
);
List
<
TaskModelDto
>
taskModelList
=
new
ArrayList
<>();
IntStream
.
range
(
0
,
list
.
size
()).
forEach
(
index
->
{
TaskModelDto
taskModelDto
=
this
.
buildTaskModelDto
(
list
.
get
(
index
),
workflowResultList
.
get
(
index
));
taskModelList
.
add
(
taskModelDto
);
});
commonService
.
buildTaskModel
(
taskModelList
);
}
/**
...
...
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