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
570b2f87
Commit
570b2f87
authored
Oct 09, 2024
by
李秀明
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
系统部件图标取值修改
parent
c90e6808
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
3 additions
and
2 deletions
+3
-2
FireFightingSystemGroupServiceImpl.java
...nage/service/impl/FireFightingSystemGroupServiceImpl.java
+2
-1
FireFightingSystemMapper.xml
...ip/src/main/resources/mapper/FireFightingSystemMapper.xml
+1
-1
No files found.
amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/service/impl/FireFightingSystemGroupServiceImpl.java
View file @
570b2f87
...
@@ -304,7 +304,8 @@ public class FireFightingSystemGroupServiceImpl extends ServiceImpl<FireFighting
...
@@ -304,7 +304,8 @@ public class FireFightingSystemGroupServiceImpl extends ServiceImpl<FireFighting
equipment
.
put
(
"num"
,
Integer
.
valueOf
(
equipmentMap
.
getOrDefault
(
"count"
,
"0"
).
toString
()));
equipment
.
put
(
"num"
,
Integer
.
valueOf
(
equipmentMap
.
getOrDefault
(
"count"
,
"0"
).
toString
()));
equipment
.
put
(
"unit"
,
equipmentMap
.
get
(
"unit"
));
equipment
.
put
(
"unit"
,
equipmentMap
.
get
(
"unit"
));
if
(
Objects
.
nonNull
(
imageEquipment
))
{
if
(
Objects
.
nonNull
(
imageEquipment
))
{
equipment
.
put
(
"img"
,
StringUtils
.
hasText
(
imageEquipment
.
getShbzImg
())
?
imageEquipment
.
getShbzImg
()
:
imageEquipment
.
getImg
());
// equipment.put("img", StringUtils.hasText(imageEquipment.getShbzImg()) ? imageEquipment.getShbzImg() : imageEquipment.getImg());
equipment
.
put
(
"img"
,
imageEquipment
.
getImg
());
}
}
equipment
.
put
(
"sort"
,
relationEntity
.
getSort
());
equipment
.
put
(
"sort"
,
relationEntity
.
getSort
());
equipment
.
put
(
"type"
,
relationEntity
.
getType
());
equipment
.
put
(
"type"
,
relationEntity
.
getType
());
...
...
amos-boot-system-equip/src/main/resources/mapper/FireFightingSystemMapper.xml
View file @
570b2f87
...
@@ -100,7 +100,7 @@
...
@@ -100,7 +100,7 @@
wle.NAME equipment_name,
wle.NAME equipment_name,
count(spe.id) num,
count(spe.id) num,
unit.name unit_name,
unit.name unit_name,
wle.
shbz_
img img,
wle.img img,
cate.NAME AS equipmentCateGoryName
cate.NAME AS equipmentCateGoryName
FROM
FROM
wl_equipment_specific AS spe
wl_equipment_specific AS spe
...
...
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