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
13e9917e
Commit
13e9917e
authored
Jul 14, 2024
by
tianyiming
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
使用登记报错为批量回滚es将equipId放入list中
parent
e271d8b1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
18 additions
and
3 deletions
+18
-3
JgUseRegistrationServiceImpl.java
...ule/jg/biz/service/impl/JgUseRegistrationServiceImpl.java
+18
-3
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/JgUseRegistrationServiceImpl.java
View file @
13e9917e
...
@@ -1204,6 +1204,8 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
...
@@ -1204,6 +1204,8 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
useInfo
.
setIsIntoManagement
(
Boolean
.
TRUE
);
useInfo
.
setIsIntoManagement
(
Boolean
.
TRUE
);
useInfoMapper
.
updateById
(
useInfo
);
useInfoMapper
.
updateById
(
useInfo
);
// 更新es
// 更新es
//为批量回滚es将equipId放入list中
mapData
.
put
(
"equipId"
,
new
ArrayList
<>().
add
(
mapData
.
get
(
"equipId"
)));
updateEsData
(
usePlace
,
mapData
,
otherInfo
,
jgUseRegistration
,
jsonObject
,
Boolean
.
FALSE
);
updateEsData
(
usePlace
,
mapData
,
otherInfo
,
jgUseRegistration
,
jsonObject
,
Boolean
.
FALSE
);
jgResumeInfoService
.
createWithModel
(
JgResumeInfoDto
.
builder
()
jgResumeInfoService
.
createWithModel
(
JgResumeInfoDto
.
builder
()
.
applyNo
(
jgUseRegistration
.
getApplyNo
())
.
applyNo
(
jgUseRegistration
.
getApplyNo
())
...
@@ -1292,6 +1294,8 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
...
@@ -1292,6 +1294,8 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
// 更新es
// 更新es
HashMap
<
String
,
Map
<
String
,
Object
>>
objMap
=
new
HashMap
<>();
HashMap
<
String
,
Map
<
String
,
Object
>>
objMap
=
new
HashMap
<>();
HashMap
<
String
,
Object
>
param
=
new
HashMap
<>();
HashMap
<
String
,
Object
>
param
=
new
HashMap
<>();
List
<
String
>
equipIds
=
(
List
<
String
>)
dataMap
.
get
(
"equipId"
);
for
(
String
equipId
:
equipIds
)
{
if
(
rollBake
)
{
if
(
rollBake
)
{
param
.
put
(
"EQU_STATE"
,
EquimentEnum
.
WEIDENGJI
.
getCode
());
param
.
put
(
"EQU_STATE"
,
EquimentEnum
.
WEIDENGJI
.
getCode
());
param
.
put
(
"IS_INTO_MANAGEMENT"
,
Boolean
.
FALSE
);
param
.
put
(
"IS_INTO_MANAGEMENT"
,
Boolean
.
FALSE
);
...
@@ -1316,7 +1320,8 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
...
@@ -1316,7 +1320,8 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
param
.
put
(
"EQU_CODE"
,
dataMap
.
get
(
"equCode"
));
param
.
put
(
"EQU_CODE"
,
dataMap
.
get
(
"equCode"
));
param
.
put
(
"USE_ORG_CODE"
,
jgUseRegistration
.
getUseRegistrationCode
());
param
.
put
(
"USE_ORG_CODE"
,
jgUseRegistration
.
getUseRegistrationCode
());
}
}
objMap
.
put
((
String
)
dataMap
.
get
(
"equipId"
),
param
);
objMap
.
put
(
equipId
,
param
);
}
tzsServiceFeignClient
.
commonUpdateEsDataByIds
(
objMap
);
tzsServiceFeignClient
.
commonUpdateEsDataByIds
(
objMap
);
}
}
...
@@ -1385,11 +1390,11 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
...
@@ -1385,11 +1390,11 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
commonService
.
checkForExecuteFlow
(
nextTaskId
,
instanceId
);
commonService
.
checkForExecuteFlow
(
nextTaskId
,
instanceId
);
JgUseRegistration
jgUseRegistration
=
this
.
getBaseMapper
().
selectById
(
id
);
JgUseRegistration
jgUseRegistration
=
this
.
getBaseMapper
().
selectById
(
id
);
if
(!
ObjectUtils
.
isEmpty
(
carNumber
))
{
LambdaQueryWrapper
<
JgUseRegistrationEq
>
eq
=
new
QueryWrapper
<
JgUseRegistrationEq
>().
lambda
()
LambdaQueryWrapper
<
JgUseRegistrationEq
>
eq
=
new
QueryWrapper
<
JgUseRegistrationEq
>().
lambda
()
.
eq
(
JgUseRegistrationEq:
:
getEquipTransferId
,
jgUseRegistration
.
getSequenceNbr
());
.
eq
(
JgUseRegistrationEq:
:
getEquipTransferId
,
jgUseRegistration
.
getSequenceNbr
());
JgUseRegistrationEq
jgUseRegistrationEq
=
jgRelationEquipMapper
.
selectOne
(
eq
);
JgUseRegistrationEq
jgUseRegistrationEq
=
jgRelationEquipMapper
.
selectOne
(
eq
);
recordJsonObject
.
put
(
"equipId"
,
jgUseRegistrationEq
.
getEquId
());
recordJsonObject
.
put
(
"equipId"
,
new
ArrayList
<>().
add
(
jgUseRegistrationEq
.
getEquId
()));
if
(!
ObjectUtils
.
isEmpty
(
carNumber
))
{
// 更新安全追溯-场内车辆中的“车牌号字段” 保证唯一性
// 更新安全追溯-场内车辆中的“车牌号字段” 保证唯一性
LambdaQueryWrapper
<
IdxBizJgRegisterInfo
>
wrapper
=
new
LambdaQueryWrapper
<>();
LambdaQueryWrapper
<
IdxBizJgRegisterInfo
>
wrapper
=
new
LambdaQueryWrapper
<>();
wrapper
.
eq
(
IdxBizJgRegisterInfo:
:
getCarNumber
,
carNumber
);
wrapper
.
eq
(
IdxBizJgRegisterInfo:
:
getCarNumber
,
carNumber
);
...
@@ -1431,7 +1436,17 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
...
@@ -1431,7 +1436,17 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
// 按单位办理
// 按单位办理
if
(
"unit"
.
equals
(
manageType
))
{
if
(
"unit"
.
equals
(
manageType
))
{
this
.
updateUseRegUnitData
(
jgUseRegistration
.
getSequenceNbr
(),
operate
,
workflowResultDto
,
false
,
jsonObject
);
this
.
updateUseRegUnitData
(
jgUseRegistration
.
getSequenceNbr
(),
operate
,
workflowResultDto
,
false
,
jsonObject
);
LambdaQueryWrapper
<
JgUseRegistrationEq
>
eq
=
new
QueryWrapper
<
JgUseRegistrationEq
>().
lambda
()
.
eq
(
JgUseRegistrationEq:
:
getEquipTransferId
,
jgUseRegistration
.
getSequenceNbr
());
List
<
JgUseRegistrationEq
>
jgUseRegistrationEq
=
jgRelationEquipMapper
.
selectList
(
eq
);
List
<
String
>
equipIds
=
jgUseRegistrationEq
.
stream
().
map
(
JgUseRegistrationEq:
:
getEquId
).
collect
(
Collectors
.
toList
());
recordJsonObject
.
put
(
"equipId"
,
equipIds
);
}
else
{
}
else
{
LambdaQueryWrapper
<
JgUseRegistrationEq
>
eq
=
new
QueryWrapper
<
JgUseRegistrationEq
>().
lambda
()
.
eq
(
JgUseRegistrationEq:
:
getEquipTransferId
,
jgUseRegistration
.
getSequenceNbr
());
List
<
JgUseRegistrationEq
>
jgUseRegistrationEq
=
jgRelationEquipMapper
.
selectList
(
eq
);
List
<
String
>
equipIds
=
jgUseRegistrationEq
.
stream
().
map
(
JgUseRegistrationEq:
:
getEquId
).
collect
(
Collectors
.
toList
());
recordJsonObject
.
put
(
"equipId"
,
equipIds
);
this
.
updateData
(
jgUseRegistration
.
getSequenceNbr
(),
operate
,
workflowResultDto
,
carNumber
,
false
,
jsonObject
);
this
.
updateData
(
jgUseRegistration
.
getSequenceNbr
(),
operate
,
workflowResultDto
,
carNumber
,
false
,
jsonObject
);
}
}
}
}
...
...
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