电力汇总-代码修改

ruoyi-wages/src/main/java/com/ruoyi/system/service/impl/PowerWagesServiceImpl.java

@@ -49,7 +49,8 @@ public class PowerWagesServiceImpl implements PowerWagesService {
             //定义需要解析的sheet名
             List<String> sheetList = Arrays.asList("电量数据专业化公司", "外界电量数据");
             // 定义需要过滤的关键词列表
-            List<String> filterList = Arrays.asList("null");
+            List<String> filterList = Arrays.asList( "小计", "总表小计", "劳服总表", "校验", "null");
+            List<String> filterList2 = Arrays.asList("20000","30000","40000");
             // 获取上传文件的输入流
             for (int i = 0; i < sheetList.size(); i++) {
                 type = type + i;
@@ -68,6 +69,7 @@ public class PowerWagesServiceImpl implements PowerWagesService {
                     inputStream.close();
 
                     PowerList = PowerList.parallelStream()
+                            .filter(v -> !filterList2.contains(v.getA2()))
                             .filter(v -> v.getA2() != null && !v.getA2().equals("null") && !filterList.contains(v.getA2()))
                             .filter(v -> v.getA3() != null && !v.getA3().equals("null") && !filterList.contains(v.getA3()))
                             .peek(v -> v.setComparisonId(comparisonId))