修改bug'

amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/service/impl/EquipmentSpecificAlarmServiceImpl.java

@@ -109,7 +109,17 @@ public class EquipmentSpecificAlarmServiceImpl extends ServiceImpl<EquipmentSpec
         if (0 == list.size()) {
             throw new RuntimeException("导出数据列表无数据！");
         }
-        ExcelUtil.createTemplate(response, "设备告警信息", "设备告警信息", equipmentDownloads, EquipmentAlarmDownloadVO.class, null, false);
+
+        if(alarmType.equals("FIREALARM")){
+            ExcelUtil.createTemplate(response, "设备火灾报警信息", "设备火灾报警信息", equipmentDownloads, EquipmentAlarmDownloadVO.class, null, false);
+
+        }else if(alarmType.equals("BREAKDOWN")){
+            ExcelUtil.createTemplate(response, "设备故障告警信息", "设备故障告警信息", equipmentDownloads, EquipmentAlarmDownloadVO.class, null, false);
+
+        }else{
+            ExcelUtil.createTemplate(response, "设备告警信息", "设备告警信息", equipmentDownloads, EquipmentAlarmDownloadVO.class, null, false);
+
+        }
 
     }
 

amos-boot-system-patrol/src/main/resources/db/mapper/dbTemplate_input_item.xml

@@ -212,7 +212,7 @@
 <!--		,prpi.id  as routePointItemId-->
 		FROM
 		p_point_classify ppc
-		LEFT JOIN p_point_inputitem ppi ON ppi.classify_ids = ppc.id
+		LEFT JOIN p_point_inputitem ppi ON ppi.classify_ids = ppc.id and ppc.point_id=ppi.point_id
 		LEFT JOIN p_input_item pii ON pii.id = ppi.input_item_id
 <!--		lEFT JOIN p_route_point_item prpi ON prpi.point_input_item_id = pii.id-->
 		WHERE pii.is_delete = '0'