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
929fa698
Commit
929fa698
authored
Jan 20, 2024
by
LiuLin
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix(JG):设备移交保存字段返回
parent
169c48fb
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
10 additions
and
1 deletion
+10
-1
JgEquipTransferDto.java
...ejoin/amos/boot/module/jg/api/dto/JgEquipTransferDto.java
+6
-0
JgEquipTransferMapper.xml
...g-api/src/main/resources/mapper/JgEquipTransferMapper.xml
+2
-1
JgEquipTransferServiceImpl.java
...odule/jg/biz/service/impl/JgEquipTransferServiceImpl.java
+2
-0
No files found.
amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/java/com/yeejoin/amos/boot/module/jg/api/dto/JgEquipTransferDto.java
View file @
929fa698
...
...
@@ -130,4 +130,10 @@ public class JgEquipTransferDto extends BaseDto {
@ApiModelProperty
(
value
=
"施工单位统一信用代码-数据隔离使用"
)
private
String
installUnitCodeFilter
;
/**
* 下一节点可执行人逗号分割
*/
@ApiModelProperty
(
value
=
"下一节点可执行人逗号分割-数据隔离使用"
)
private
String
nextExecuteUserIds
;
}
amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/resources/mapper/JgEquipTransferMapper.xml
View file @
929fa698
...
...
@@ -54,7 +54,8 @@
tec2.name AS equCategory,
tec1.name AS equList,
tec.name AS equDefine,
jet.create_date AS createDate
jet.create_date AS createDate,
jet.next_execute_user_ids as nextExecuteUserIds
FROM
tzs_jg_equip_transfer jet
LEFT JOIN tzs_jg_equip_transfer_eq ete ON ete.equip_transfer_id = jet.sequence_nbr
...
...
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 @
929fa698
...
...
@@ -272,6 +272,7 @@ public class JgEquipTransferServiceImpl extends BaseService<JgEquipTransferDto,
transfer
.
setApplyStatus
(
String
.
valueOf
(
FlowStatusEnum
.
TO_BE_PROCESSED
.
getCode
()));
transfer
.
setNextTaskId
(
workflowResultDto
.
getNextTaskId
());
transfer
.
setInstanceId
(
workflowResultDto
.
getInstanceId
());
transfer
.
setNextExecuteUserIds
(
workflowResultDto
.
getNextExecutorUserIds
());
updateById
(
transfer
);
//删除暂存
...
...
@@ -414,6 +415,7 @@ public class JgEquipTransferServiceImpl extends BaseService<JgEquipTransferDto,
WorkflowResultDto
workflowResultDto
=
commonService
.
buildWorkFlowInfo
(
Collections
.
singletonList
(
processTaskDTO
)).
get
(
0
);
equipTransfer
.
setPromoter
(
""
);
equipTransfer
.
setNextExecuteIds
(
workflowResultDto
.
getNextExecutorRoleIds
());
equipTransfer
.
setNextExecuteUserIds
(
workflowResultDto
.
getNextExecutorUserIds
());
equipTransfer
.
setApplyStatus
(
String
.
valueOf
(
FlowStatusEnum
.
ROLLBACK
.
getCode
()));
equipTransfer
.
setNextTaskId
(
workflowResultDto
.
getNextTaskId
());
baseMapper
.
updateById
(
equipTransfer
);
...
...
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