完善月报表

platform-service/src/main/java/com/platform/service/big/impl/BigScreenSbInfoServiceImpl.java

@@ -290,6 +290,7 @@ public class BigScreenSbInfoServiceImpl extends BaseServiceImpl<SbInfoMapper, Sb
             }
         } else {// 月：统计每天的：需要当天0点减去前天0点的：注意23号0点减去22号0点，是22号的
             LocalDate localDate = LocalDate.of(record.getYear(), record.getMonth(), 1);
+            int nowDay = localDate.getDayOfMonth();
             int days = localDate.lengthOfMonth();
 
             // 找到下个月1号晚上0点的，用来计算这个月最后一天的耗电量
@@ -314,6 +315,9 @@ public class BigScreenSbInfoServiceImpl extends BaseServiceImpl<SbInfoMapper, Sb
                         if (degreeLog.getLine() == null) {
                             throw new BusinessException("设备未设置电力线路, 设备名称：" + degreeLog.getSbName() + ", 设备编号：" + degreeLog.getSbNo());
                         }
+                        if(degreeLog.getDay().equals(nowDay)){// 当天时间不计算。因为当天还没过完，没有全部数据
+                            continue;
+                        }
                         if (degreeLog.getLine().toString().equals(dict.getValue())) {
                             if (degreeLog.getDay().equals(i)) {
                                 if (degreeLog.getType().equals(1)) {