优化报表模板

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

@@ -1738,7 +1738,13 @@ public class FireFightingSystemServiceImpl extends ServiceImpl<FireFightingSyste
                 }
                 attachAlarmList = dtos;
             }
-            map.put("attachAlarmList", attachAlarmList);
+            List<ReportAlarmDto> newAttachAlarmList = new ArrayList<>();
+            for (ReportAlarmDto dto : attachAlarmList) {
+                if(!newAttachAlarmList.contains(dto)){
+                    newAttachAlarmList.add(dto);
+                }
+            }
+            map.put("attachAlarmList", newAttachAlarmList);
         }else {
             return null;
         }
@@ -1967,12 +1973,16 @@ public class FireFightingSystemServiceImpl extends ServiceImpl<FireFightingSyste
                 }
                 attachAlarmList = dtos;
             }
-            map.put("attachAlarmList", attachAlarmList);
+            List<ReportAlarmDto> newAttachAlarmList = new ArrayList<>();
+            for (ReportAlarmDto dto : attachAlarmList) {
+                if(!newAttachAlarmList.contains(dto)){
+                    newAttachAlarmList.add(dto);
+                }
+            }
+            map.put("attachAlarmList", newAttachAlarmList);
         }else {
            return null;
         }
-
-
         return map;
     }
 
@@ -2189,7 +2199,13 @@ public class FireFightingSystemServiceImpl extends ServiceImpl<FireFightingSyste
                 }
                 attachAlarmList = dtos;
             }
-            map.put("attachAlarmList", attachAlarmList);
+            List<ReportAlarmDto> newAttachAlarmList = new ArrayList<>();
+            for (ReportAlarmDto dto : attachAlarmList) {
+                if(!newAttachAlarmList.contains(dto)){
+                    newAttachAlarmList.add(dto);
+                }
+            }
+            map.put("attachAlarmList", newAttachAlarmList);
         }else {
             return null ;
         }