Commit afc60d68 authored by suhuiguang's avatar suhuiguang

1.设备编辑调整所属系统后新增插入的告警日志系统未原来的bug修改

parent 02725513
...@@ -101,4 +101,12 @@ public class EquipmentSpecificIndex extends BaseEntity { ...@@ -101,4 +101,12 @@ public class EquipmentSpecificIndex extends BaseEntity {
@TableField(exist = false) @TableField(exist = false)
private String valueEnum; private String valueEnum;
@ApiModelProperty(value = "设备CODE")
@TableField(exist = false)
private String equipmentSpecificCode;
@ApiModelProperty(value = "设备所属系统ids")
@TableField(exist = false)
private String systemId;
} }
...@@ -70,9 +70,6 @@ public class EquipmentDetailController extends AbstractBaseController { ...@@ -70,9 +70,6 @@ public class EquipmentDetailController extends AbstractBaseController {
IEquipmentSpecificSerivce equipmentSpecificSerivce; IEquipmentSpecificSerivce equipmentSpecificSerivce;
@Autowired @Autowired
private IEquipmentDetailService equipmentDetailService;
@Autowired
private IExcelService excelService; private IExcelService excelService;
@Autowired @Autowired
......
...@@ -55,7 +55,9 @@ ...@@ -55,7 +55,9 @@
wesi.update_date AS updateDate, wesi.update_date AS updateDate,
ed.code AS equipmentCode, ed.code AS equipmentCode,
ed.equipment_id AS equipmentId, ed.equipment_id AS equipmentId,
ed.id AS equipmentDetailId ed.id AS equipmentDetailId,
wes.code as equipmentSpecificCode,
wes.system_id as systemId
FROM FROM
wl_equipment_specific_index AS wesi wl_equipment_specific_index AS wesi
LEFT JOIN wl_equipment_specific AS wes ON wes.id = wesi.equipment_specific_id LEFT JOIN wl_equipment_specific AS wes ON wes.id = wesi.equipment_specific_id
......
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