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
657daf1a
Commit
657daf1a
authored
Mar 12, 2024
by
刘林
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix(JG):设备移交添加状态校验
parent
26383706
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
4 additions
and
0 deletions
+4
-0
JgEquipTransferServiceImpl.java
...odule/jg/biz/service/impl/JgEquipTransferServiceImpl.java
+4
-0
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 @
657daf1a
...
@@ -340,6 +340,8 @@ public class JgEquipTransferServiceImpl extends BaseService<JgEquipTransferDto,
...
@@ -340,6 +340,8 @@ public class JgEquipTransferServiceImpl extends BaseService<JgEquipTransferDto,
public
void
accept
(
JgEquipTransferDto
jgEquipTransferDto
,
String
op
)
{
public
void
accept
(
JgEquipTransferDto
jgEquipTransferDto
,
String
op
)
{
ReginParams
reginParams
=
JSONObject
.
parseObject
(
redisUtils
.
get
(
RedisKey
.
buildReginKey
(
RequestContext
.
getExeUserId
(),
RequestContext
.
getToken
())).
toString
(),
ReginParams
.
class
);
ReginParams
reginParams
=
JSONObject
.
parseObject
(
redisUtils
.
get
(
RedisKey
.
buildReginKey
(
RequestContext
.
getExeUserId
(),
RequestContext
.
getToken
())).
toString
(),
ReginParams
.
class
);
JgEquipTransfer
jgEquipTransfer
=
baseMapper
.
selectById
(
jgEquipTransferDto
.
getSequenceNbr
());
JgEquipTransfer
jgEquipTransfer
=
baseMapper
.
selectById
(
jgEquipTransferDto
.
getSequenceNbr
());
// 检查实际状态是否不等于期望状态
commonService
.
checkExpectedStatus
(
jgEquipTransfer
.
getApplyStatus
());
TaskResultDTO
workDto
=
new
TaskResultDTO
();
TaskResultDTO
workDto
=
new
TaskResultDTO
();
workDto
.
setResultCode
(
"approvalStatus"
);
workDto
.
setResultCode
(
"approvalStatus"
);
...
@@ -420,6 +422,8 @@ public class JgEquipTransferServiceImpl extends BaseService<JgEquipTransferDto,
...
@@ -420,6 +422,8 @@ public class JgEquipTransferServiceImpl extends BaseService<JgEquipTransferDto,
// 查询装备移交信息
// 查询装备移交信息
JgEquipTransfer
equipTransfer
=
baseMapper
.
selectById
(
equipTransferInfo
.
getSequenceNbr
());
JgEquipTransfer
equipTransfer
=
baseMapper
.
selectById
(
equipTransferInfo
.
getSequenceNbr
());
if
(
equipTransfer
!=
null
)
{
if
(
equipTransfer
!=
null
)
{
// 检查实际状态是否不等于期望状态
commonService
.
checkExpectedStatus
(
equipTransfer
.
getApplyStatus
());
// 回滚工作流
// 回滚工作流
ProcessTaskDTO
processTaskDTO
=
cmWorkflowService
.
rollBack
(
equipTransferInfo
.
getInstanceId
());
ProcessTaskDTO
processTaskDTO
=
cmWorkflowService
.
rollBack
(
equipTransferInfo
.
getInstanceId
());
WorkflowResultDto
workflowResultDto
=
commonService
.
buildWorkFlowInfo
(
Collections
.
singletonList
(
processTaskDTO
)).
get
(
0
);
WorkflowResultDto
workflowResultDto
=
commonService
.
buildWorkFlowInfo
(
Collections
.
singletonList
(
processTaskDTO
)).
get
(
0
);
...
...
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