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
a09a4a7e
Commit
a09a4a7e
authored
Jan 23, 2024
by
刘林
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix(JG):设备移交详情Bug修改
parent
58fa46ac
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
19 additions
and
2 deletions
+19
-2
JgEquipTransferServiceImpl.java
...odule/jg/biz/service/impl/JgEquipTransferServiceImpl.java
+19
-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/JgEquipTransferServiceImpl.java
View file @
a09a4a7e
...
...
@@ -471,12 +471,29 @@ public class JgEquipTransferServiceImpl extends BaseService<JgEquipTransferDto,
if
(
Objects
.
isNull
(
equipTransfer
))
return
null
;
return
Stream
.
concat
(
createEquipTransferInfo
(
equipTransfer
).
entrySet
().
stream
(),
baseMapper
.
queryEquipInformation
(
sequenceNbr
).
get
(
0
).
entrySet
().
stream
())
String
[]
fields
=
{
"productPhoto"
,
"designDoc"
,
"designStandard"
,
"factoryStandard"
,
"productQualityYieldProve"
,
"insUseMaintainExplain"
,
"inspectReport"
,
"proxyStatementAttachment"
,
"installContractAttachment"
};
List
<
Map
<
String
,
Object
>>
equipmentInfos
=
this
.
baseMapper
.
queryEquipInformation
(
sequenceNbr
);
Map
<
String
,
Object
>
equipTransferInfo
=
createEquipTransferInfo
(
equipTransfer
);
handleJsonArrayFields
(
equipTransferInfo
,
fields
);
handleJsonArrayFields
(
equipmentInfos
.
get
(
0
),
fields
);
return
Stream
.
concat
(
equipTransferInfo
.
entrySet
().
stream
(),
equipmentInfos
.
get
(
0
).
entrySet
().
stream
())
.
filter
(
entry
->
entry
.
getValue
()
!=
null
)
.
collect
(
Collectors
.
toMap
(
Map
.
Entry
::
getKey
,
Map
.
Entry
::
getValue
,
(
existing
,
replacement
)
->
existing
));
}
private
void
handleJsonArrayFields
(
Map
<
String
,
Object
>
map
,
String
[]
fields
)
{
for
(
String
field
:
fields
)
{
map
.
computeIfPresent
(
field
,
(
key
,
value
)
->
JSON
.
parseArray
(
value
.
toString
()));
}
}
/**
* 插入代办
*/
...
...
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