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
40f4868a
Commit
40f4868a
authored
Oct 13, 2022
by
tangwei
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修改拓扑图bug
parent
068d964f
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
6 additions
and
1 deletion
+6
-1
TopographyController.java
.../yeejoin/equipmanage/controller/TopographyController.java
+6
-1
No files found.
amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/controller/TopographyController.java
View file @
40f4868a
...
@@ -655,6 +655,8 @@ public class TopographyController extends AbstractBaseController {
...
@@ -655,6 +655,8 @@ public class TopographyController extends AbstractBaseController {
ConcurrentHashMap
map1
=
new
ConcurrentHashMap
();
ConcurrentHashMap
map1
=
new
ConcurrentHashMap
();
List
<
String
>
list
=
equipmentIndexService
.
getGruopName
(
equipmentId
);
List
<
String
>
list
=
equipmentIndexService
.
getGruopName
(
equipmentId
);
list
.
forEach
(
x
->
{
list
.
forEach
(
x
->
{
if
(!
""
.
equals
(
x
))
{
QueryWrapper
<
EquipmentIndex
>
wrapper
=
new
QueryWrapper
<>();
QueryWrapper
<
EquipmentIndex
>
wrapper
=
new
QueryWrapper
<>();
wrapper
.
eq
(
"equipment_id"
,
equipmentId
);
wrapper
.
eq
(
"equipment_id"
,
equipmentId
);
wrapper
.
eq
(
"group_name"
,
x
);
wrapper
.
eq
(
"group_name"
,
x
);
...
@@ -673,9 +675,12 @@ public class TopographyController extends AbstractBaseController {
...
@@ -673,9 +675,12 @@ public class TopographyController extends AbstractBaseController {
properList
.
add
(
equProperty
);
properList
.
add
(
equProperty
);
});
});
map
.
put
(
x
,
properList
);
map
.
put
(
x
,
properList
);
}
});
});
QueryWrapper
<
EquipmentIndex
>
wrappernull
=
new
QueryWrapper
<>();
QueryWrapper
<
EquipmentIndex
>
wrappernull
=
new
QueryWrapper
<>();
wrappernull
.
isNull
(
"group_name"
).
or
().
eq
(
"group_name"
,
"
"
);
wrappernull
.
isNull
(
"group_name"
).
or
().
eq
(
"group_name"
,
""
);
wrappernull
.
eq
(
"equipment_id"
,
equipmentId
);
wrappernull
.
eq
(
"equipment_id"
,
equipmentId
);
wrappernull
.
orderByAsc
(
"sort_num"
);
wrappernull
.
orderByAsc
(
"sort_num"
);
List
<
EquProperty
>
properList
=
new
ArrayList
<>();
List
<
EquProperty
>
properList
=
new
ArrayList
<>();
...
...
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