Commit 4fcd5d39 authored by KeYong's avatar KeYong

修改bug

parent f7efafb4
...@@ -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
...@@ -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
......
...@@ -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
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment