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
153d3a31
Commit
153d3a31
authored
Dec 26, 2024
by
刘林
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix(jg):处理管道历史设备刷数据问题
parent
fd42717c
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
6 additions
and
2 deletions
+6
-2
JgUseRegistrationServiceImpl.java
...ule/jg/biz/service/impl/JgUseRegistrationServiceImpl.java
+6
-2
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 @
153d3a31
...
...
@@ -1945,10 +1945,13 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
jsonObject
.
put
(
"carNumber"
,
idxBizJgRegisterInfo
.
getCarNumber
());
jsonObject
.
put
(
"regType"
,
jgUseRegistration
.
getRegType
());
}
else
{
List
<
Map
<
String
,
Object
>>
equipmentLists
=
(
List
<
Map
<
String
,
Object
>>)
jsonObject
.
get
(
"equipmentLists"
);
List
<
String
>
records
=
equipmentLists
.
stream
().
map
(
v
->
(
String
)
v
.
get
(
"record"
)).
collect
(
toList
());
if
(
record
==
null
||
record
.
isEmpty
())
{
record
=
records
.
stream
().
findFirst
().
orElse
(
null
);
}
// 完成、作废时显示历史数据,其他状态显示实时数据
if
(!(
jgUseRegistration
.
getStatus
().
equals
(
FlowStatusEnum
.
TO_BE_FINISHED
.
getName
())
||
jgUseRegistration
.
getStatus
().
equals
(
FlowStatusEnum
.
TO_BE_DISCARD
.
getName
())))
{
List
<
Map
<
String
,
Object
>>
equipmentLists
=
(
List
<
Map
<
String
,
Object
>>)
jsonObject
.
get
(
"equipmentLists"
);
List
<
String
>
records
=
equipmentLists
.
stream
().
map
(
v
->
(
String
)
v
.
get
(
"record"
)).
collect
(
toList
());
jsonObject
.
remove
(
"equipmentLists"
);
// 查询气瓶设备详情
if
(
CylinderTypeEnum
.
CYLINDER
.
getCode
().
equals
(
jsonObject
.
get
(
"EQU_CATEGORY_CODE"
)))
{
...
...
@@ -1964,6 +1967,7 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
jsonObject
.
put
(
"equipmentLists"
,
jgUseRegistrationMapper
.
queryForUnitPipelineEquipment
(
records
));
}
}
this
.
fillLastEquipDetail
(
jsonObject
,
record
);
//历史管道信息,查询详情
}
jsonObject
.
put
(
"useRegistrationCode"
,
jgUseRegistration
.
getUseRegistrationCode
());
// 转化 附件 字段
...
...
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