Merge branch 'developer' of 172.16.10.76:moa/amos-boot-biz into developer

amos-boot-module/amos-boot-module-api/amos-boot-module-equip-api/src/main/java/com/yeejoin/equipmanage/common/entity/EquipmentSpecificIndex.java

@@ -101,4 +101,12 @@ public class EquipmentSpecificIndex extends BaseEntity {
 
     @TableField(exist = false)
     private String valueEnum;
+
+    @ApiModelProperty(value = "设备CODE")
+    @TableField(exist = false)
+    private String equipmentSpecificCode;
+
+    @ApiModelProperty(value = "设备所属系统ids")
+    @TableField(exist = false)
+    private String systemId;
 }

amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/controller/EquipmentDetailController.java

@@ -70,9 +70,6 @@ public class EquipmentDetailController extends AbstractBaseController {
     IEquipmentSpecificSerivce equipmentSpecificSerivce;
 
     @Autowired
-    private IEquipmentDetailService equipmentDetailService;
-
-    @Autowired
     private IExcelService excelService;
 
     @Autowired

amos-boot-system-equip/src/main/resources/mapper/EquipmentSpecificIndexMapper.xml

@@ -55,7 +55,9 @@
 			wesi.update_date AS updateDate,
 			ed.code AS equipmentCode,
 			ed.equipment_id AS equipmentId,
-			ed.id AS equipmentDetailId
+			ed.id AS equipmentDetailId,
+			wes.code as equipmentSpecificCode,
+			wes.system_id as systemId
         FROM
         wl_equipment_specific_index AS wesi
         LEFT JOIN wl_equipment_specific AS wes ON wes.id = wesi.equipment_specific_id