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
0c724655
Commit
0c724655
authored
Dec 20, 2024
by
韩桐桐
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix(jg):压力管道安装告知业务未进流程根据工程装置id查询最新的管道列表
parent
ff4d6963
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
2 additions
and
2 deletions
+2
-2
JgInstallationNoticeServiceImpl.java
.../jg/biz/service/impl/JgInstallationNoticeServiceImpl.java
+2
-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/JgInstallationNoticeServiceImpl.java
View file @
0c724655
...
...
@@ -343,7 +343,6 @@ public class JgInstallationNoticeServiceImpl extends BaseService<JgInstallationN
lambda
.
eq
(
JgInstallationNoticeEq:
:
getEquipTransferId
,
installationInfo
.
get
(
"sequenceNbr"
));
List
<
JgInstallationNoticeEq
>
jgInstallationNoticeEqs
=
jgInstallationNoticeEqMapper
.
selectList
(
lambda
);
if
(!
ValidationUtil
.
isEmpty
(
jgInstallationNoticeEqs
))
{
List
<
String
>
ids
=
jgInstallationNoticeEqs
.
stream
().
map
(
item
->
item
.
getEquId
()).
collect
(
Collectors
.
toList
());
// 压力管道从工程装置表查询设备信息
if
(
PipelineEnum
.
INDUSTRIAL_PIPELINE
.
getCode
().
equals
(
equCategory
))
{
String
projectContraptionId
=
(
String
)
installationInfo
.
get
(
"projectContraptionId"
);
...
...
@@ -351,8 +350,9 @@ public class JgInstallationNoticeServiceImpl extends BaseService<JgInstallationN
installationInfo
.
put
(
"pipelineLength"
,
projectContraption
.
getPipelineLength
());
installationInfo
.
put
(
"projectContraptionNo"
,
projectContraption
.
getProjectContraptionNo
());
installationInfo
.
put
(
"projectContraption"
,
projectContraption
.
getProjectContraption
());
equipListMaps
=
jgInstallationNoticeMapper
.
getPipelineEquInfoByRecords
(
ids
);
equipListMaps
=
projectContraptionService
.
getBaseMapper
().
selectEquipList
(
projectContraptionId
);
}
else
{
List
<
String
>
ids
=
jgInstallationNoticeEqs
.
stream
().
map
(
JgInstallationNoticeEq:
:
getEquId
).
collect
(
Collectors
.
toList
());
Iterable
<
ESEquipmentCategoryDto
>
equips
=
esEquipmentCategory
.
findAllById
(
ids
);
equipListMaps
=
getEquipListMaps
(
equips
);
}
...
...
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