低空不欠债率-送电处理

business-common/src/main/java/com/rongwei/bscommon/sys/service/impl/ZhcxLowaltitudeDebtfreeCheckMainServiceImpl.java

@@ -16,6 +16,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import java.util.List;
+import java.util.stream.Collectors;
 
 /**
  * <p>
@@ -226,17 +227,17 @@ public class ZhcxLowaltitudeDebtfreeCheckMainServiceImpl extends ServiceImpl<Zhc
             return "0.00%";
         }
 
+        //去掉/情况
+        list = list.stream().filter(item -> !"/".equals(item.getCheckresult())
+                && !"/".equals(item.getRectifyesult()))
+                .collect(Collectors.toList());
+
         int completeCount = 0;
-        int totalCount = 0;
+        int totalCount = list.size();
         for (ZhcxLowaltitudeDebtfreeCheckDetailPowerDo row : list) {
-            if ("✓".equals(row.getCheckresult()) || ("✕".equals(row.getCheckresult()) && "✓".equals(row.getRectifyesult()))) {
+            if ("✓".equals(row.getCheckresult()) || "✓".equals(row.getRectifyesult())) {
                 completeCount++;
             }
-
-            if (!"/".equals(row.getCheckresult()) && !"/".equals(row.getRectifyesult())) {
-                totalCount++;
-            }
-
         }
         // 计算机器比率
         String machineRatio;
@@ -262,21 +263,21 @@ public class ZhcxLowaltitudeDebtfreeCheckMainServiceImpl extends ServiceImpl<Zhc
             return "0.00%";
         }
 
+        //去掉/情况
+        list = list.stream().filter(item -> !"/".equals(item.getCheckresult())
+                && !"/".equals(item.getRectifyesult())
+                && !"/".equals(item.getPowerrectifyesult())
+                )
+                .collect(Collectors.toList());
+
         int completeCount = 0;
-        int totalCount = 0;
+        int totalCount = list.size();
         for (ZhcxLowaltitudeDebtfreeCheckDetailPowerDo row : list) {
             if ("✓".equals(row.getCheckresult())
-                    || ("✕".equals(row.getCheckresult()) && "✓".equals(row.getRectifyesult()))
-                    || ("✕".equals(row.getCheckresult()) && "✕".equals(row.getRectifyesult()) && "✓".equals(row.getPowerrectifyesult()))) {
+                    || "✓".equals(row.getRectifyesult())
+                    || "✓".equals(row.getPowerrectifyesult())) {
                 completeCount++;
             }
-
-            if (!"/".equals(row.getCheckresult())
-                    && !"/".equals(row.getRectifyesult())
-                    && !"/".equals(row.getPowerrectifyesult())) {
-                totalCount++;
-            }
-
         }
         // 计算机器比率
         String machineRatio;
@@ -301,17 +302,18 @@ public class ZhcxLowaltitudeDebtfreeCheckMainServiceImpl extends ServiceImpl<Zhc
             return "0.00%";
         }
 
+        //去掉/情况
+        list = list.stream().filter(item -> !"/".equals(item.getCheckresult())
+                && !"/".equals(item.getRectifyesult())
+                )
+                .collect(Collectors.toList());
+
         int completeCount = 0;
-        int totalCount = 0;
+        int totalCount = list.size();
         for (ZhcxLowaltitudeDebtfreeCheckDetailDo row : list) {
-            if ("✓".equals(row.getCheckresult()) || ("✕".equals(row.getCheckresult()) && "✓".equals(row.getRectifyesult()))) {
+            if ("✓".equals(row.getCheckresult()) || "✓".equals(row.getRectifyesult())) {
                 completeCount++;
             }
-
-            if (!"/".equals(row.getCheckresult()) && !"/".equals(row.getRectifyesult())) {
-                totalCount++;
-            }
-
         }
         // 计算机器比率
         String machineRatio;
@@ -336,21 +338,21 @@ public class ZhcxLowaltitudeDebtfreeCheckMainServiceImpl extends ServiceImpl<Zhc
             return "0.00%";
         }
 
+        //去掉/情况
+        list = list.stream().filter(item -> !"/".equals(item.getCheckresult())
+                    && !"/".equals(item.getRectifyesult())
+                    && !"/".equals(item.getPowerrectifyesult())
+                    )
+                .collect(Collectors.toList());
+
         int completeCount = 0;
-        int totalCount = 0;
+        int totalCount = list.size();
         for (ZhcxLowaltitudeDebtfreeCheckDetailDo row : list) {
             if ("✓".equals(row.getCheckresult())
-                    || ("✕".equals(row.getCheckresult()) && "✓".equals(row.getRectifyesult()))
-                    || ("✕".equals(row.getCheckresult()) && "✕".equals(row.getRectifyesult()) && "✓".equals(row.getPowerrectifyesult()))) {
+                    || "✓".equals(row.getRectifyesult())
+                    || "✓".equals(row.getPowerrectifyesult())) {
                 completeCount++;
             }
-
-            if (!"/".equals(row.getCheckresult())
-                    && !"/".equals(row.getRectifyesult())
-                    && !"/".equals(row.getPowerrectifyesult())) {
-                totalCount++;
-            }
-
         }
         // 计算机器比率
         String machineRatio;