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
111689e6
Commit
111689e6
authored
Feb 06, 2023
by
tangwei
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
增加配置
parent
f2fde89f
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
6 additions
and
4 deletions
+6
-4
FireFightingSystemServiceImpl.java
...uipmanage/service/impl/FireFightingSystemServiceImpl.java
+6
-4
No files found.
amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/service/impl/FireFightingSystemServiceImpl.java
View file @
111689e6
...
...
@@ -1159,12 +1159,13 @@ public class FireFightingSystemServiceImpl extends ServiceImpl<FireFightingSyste
public
Object
refreshEquipmentTypeAndCountNew
(
String
bizOrgCode
)
{
//获取装备分类
List
<
EquipmentCategory
>
responseList
=
this
.
iEquipmentCategoryService
.
getEquipmentCategoryListNew
(
Integer
.
valueOf
(
equipmentCategoryLeftTypeCode
),
"eq"
);
if
(
responseList
==
null
||
responseList
.
size
()
<
1
)
{
return
null
;
}
//分类数据处理
List
<
EquipmentCategory
>
list
=
typeListTreeNew
(
responseList
,
bizOrgCode
);
return
list
;
}
...
...
@@ -1175,11 +1176,10 @@ public class FireFightingSystemServiceImpl extends ServiceImpl<FireFightingSyste
// 查询所有装备
List
<
Map
<
String
,
Object
>>
listMP
=
this
.
iEquipmentCategoryService
.
getequipmentListEQNew
();
equipmentCategorys
.
forEach
(
action
->
{
//根据条件获取装备数量
List
<
Map
<
String
,
Object
>>
listM
=
listMP
.
stream
().
filter
(
x
->
x
.
get
(
"code"
).
toString
().
contains
(
action
.
getCode
())&&
x
.
get
(
"bizOrgCode"
).
toString
().
contains
(
bizOrgCode
)).
collect
(
Collectors
.
toList
());
int
num
=
listM
!=
null
?
listM
.
size
():
0
;
//设置装备数量
action
.
setCount
(
Double
.
parseDouble
(
num
+
""
));
if
(
action
.
getParentId
()
==
null
)
{
list
.
add
(
action
);
...
...
@@ -1190,11 +1190,13 @@ public class FireFightingSystemServiceImpl extends ServiceImpl<FireFightingSyste
tmpMap
.
put
(
action
.
getParentId
().
toString
(),
tmplist
);
}
else
{
if
(!
tmpMap
.
get
(
action
.
getParentId
().
toString
()).
contains
(
action
))
{
//添加子节点
tmpMap
.
get
(
action
.
getParentId
().
toString
()).
add
(
action
);
}
}
}
});
//组装数
getChildren
(
list
,
tmpMap
);
return
list
;
}
...
...
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