低空不欠债率-送电处理

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

@@ -265,11 +265,15 @@ public class ZhcxLowaltitudeDebtfreeCheckMainServiceImpl extends ServiceImpl<Zhc
         int completeCount = 0;
         int totalCount = 0;
         for (ZhcxLowaltitudeDebtfreeCheckDetailPowerDo row : list) {
-            if ("✓".equals(row.getPowerrectifyesult())) {
+            if ("✓".equals(row.getCheckresult())
+                    || ("✕".equals(row.getCheckresult()) && "✓".equals(row.getRectifyesult()))
+                    || ("✕".equals(row.getCheckresult()) && "✕".equals(row.getRectifyesult()) && "✓".equals(row.getPowerrectifyesult()))) {
                 completeCount++;
             }
 
-            if (!"/".equals(row.getPowerrectifyesult())) {
+            if (!"/".equals(row.getCheckresult())
+                    && !"/".equals(row.getRectifyesult())
+                    && !"/".equals(row.getPowerrectifyesult())) {
                 totalCount++;
             }
 
@@ -335,11 +339,15 @@ public class ZhcxLowaltitudeDebtfreeCheckMainServiceImpl extends ServiceImpl<Zhc
         int completeCount = 0;
         int totalCount = 0;
         for (ZhcxLowaltitudeDebtfreeCheckDetailDo row : list) {
-            if ("✓".equals(row.getPowerrectifyesult())) {
+            if ("✓".equals(row.getCheckresult())
+                    || ("✕".equals(row.getCheckresult()) && "✓".equals(row.getRectifyesult()))
+                    || ("✕".equals(row.getCheckresult()) && "✕".equals(row.getRectifyesult()) && "✓".equals(row.getPowerrectifyesult()))) {
                 completeCount++;
             }
 
-            if (!"/".equals(row.getPowerrectifyesult())) {
+            if (!"/".equals(row.getCheckresult())
+                    && !"/".equals(row.getRectifyesult())
+                    && !"/".equals(row.getPowerrectifyesult())) {
                 totalCount++;
             }