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
4fcd5d39
Commit
4fcd5d39
authored
Sep 06, 2022
by
KeYong
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修改bug
parent
f7efafb4
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
12 additions
and
1 deletion
+12
-1
FireEquipment.java
...oin/equipmanage/common/datasync/entity/FireEquipment.java
+5
-0
EquipmentSpecificSerivceImpl.java
...quipmanage/service/impl/EquipmentSpecificSerivceImpl.java
+6
-1
EquipmentSpecificMapper.xml
...uip/src/main/resources/mapper/EquipmentSpecificMapper.xml
+1
-0
No files found.
amos-boot-module/amos-boot-module-api/amos-boot-module-equip-api/src/main/java/com/yeejoin/equipmanage/common/datasync/entity/FireEquipment.java
View file @
4fcd5d39
...
@@ -218,4 +218,8 @@ public class FireEquipment implements Serializable {
...
@@ -218,4 +218,8 @@ public class FireEquipment implements Serializable {
@TableField
(
exist
=
false
)
@TableField
(
exist
=
false
)
private
String
qrCode
;
private
String
qrCode
;
@ApiModelProperty
(
value
=
"建筑全名"
)
@TableField
(
exist
=
false
)
private
String
fullName
;
}
}
\ No newline at end of file
amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/service/impl/EquipmentSpecificSerivceImpl.java
View file @
4fcd5d39
...
@@ -1492,7 +1492,12 @@ public class EquipmentSpecificSerivceImpl extends ServiceImpl<EquipmentSpecificM
...
@@ -1492,7 +1492,12 @@ public class EquipmentSpecificSerivceImpl extends ServiceImpl<EquipmentSpecificM
@Override
@Override
public
FireEquipment
getEquipSpecificDetail
(
EquipmentSpecific
equipmentSpecific
)
{
public
FireEquipment
getEquipSpecificDetail
(
EquipmentSpecific
equipmentSpecific
)
{
return
equipmentSpecificMapper
.
getEquipSpecificDetail
(
equipmentSpecific
.
getId
());
FireEquipment
fireEquipment
=
equipmentSpecificMapper
.
getEquipSpecificDetail
(
equipmentSpecific
.
getId
());
String
fullName
=
fireEquipment
.
getFullName
();
if
(
StringUtils
.
isNotBlank
(
fullName
)
&&
fullName
.
indexOf
(
"-"
)
!=
-
1
){
fireEquipment
.
setBuildName
(
fullName
.
split
(
"-"
)[
0
]);
}
return
fireEquipment
;
}
}
@Override
@Override
...
...
amos-boot-system-equip/src/main/resources/mapper/EquipmentSpecificMapper.xml
View file @
4fcd5d39
...
@@ -768,6 +768,7 @@
...
@@ -768,6 +768,7 @@
NOW( ) AS updatedate,
NOW( ) AS updatedate,
es.area_id AS areaid,
es.area_id AS areaid,
ws.`name` AS buildname,
ws.`name` AS buildname,
ws.full_name AS fullName,
a.`name` AS workarea,
a.`name` AS workarea,
es.qr_code as qrCode
es.qr_code as qrCode
FROM
FROM
...
...
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