소스 검색

可视化仪表状态统计更改逻辑

丁治程 4 달 전
부모
커밋
522cb905c3

+ 6 - 4
jeecg-module-interlock/src/main/java/org/jeecg/modules/interlockCountDay/service/impl/InterlockCountDayServiceImpl.java

@@ -161,13 +161,15 @@ public class InterlockCountDayServiceImpl extends ServiceImpl<InterlockCountDayM
             for (InterlockDetail detail : detailList) {
                 if (ybStatusAnNormalValue.equals(detail.getInstrumentStatus())){
                     ybAnNormalNumber++;
-                    break;
+                }
+                if (ybStatusNormalValue.equals(detail.getInstrumentStatus())){
+                    ybNormalNumber++;
                 }
             }
         }
-        if (summaryList.size() > 0){
-            ybNormalNumber = summaryList.size() - ybAnNormalNumber;
-        }
+        //if (summaryList.size() > 0){
+        //    ybNormalNumber = summaryList.size() - ybAnNormalNumber;
+        //}
         InterlockAndYbStatus interlockAndYbStatus1 = new InterlockAndYbStatus();
         interlockAndYbStatus1.setStatusName("正常");
         interlockAndYbStatus1.setNumber(String.valueOf(ybNormalNumber));