bug修复

runeconomy-xk/src/main/java/com/gyee/runeconomy/service/auto/impl/ProEconEquipmentInfoDayTopServiceImpl.java

@@ -65,6 +65,10 @@ public class ProEconEquipmentInfoDayTopServiceImpl extends ServiceImpl<ProEconEq
             TurbineInfoDay day = dayMap.get(peeidt.getWindturbineId());
             Date recordDate = peeidt.getRecordDate();
             int i = DateUtil.dayOfMonth(recordDate);
+            if (1 == i) {
+                DateTime dateTime = DateUtil.endOfMonth(recordDate);
+                i = DateUtil.dayOfMonth(dateTime);
+            }
             peeidt.setDayfdl(NumberUtil.round(day.getRfdl() / 1000, 2).doubleValue());
             peeidt.setDayllfdl(NumberUtil.round(day.getLlfdl() / 1000, 2).doubleValue());
             peeidt.setDayfs(NumberUtil.round(day.getPjfs(), 2).doubleValue());
@@ -81,10 +85,9 @@ public class ProEconEquipmentInfoDayTopServiceImpl extends ServiceImpl<ProEconEq
             peeidt.setDayLevel(level(day.getScore(), i - 1));
             peeidt.setDayglyzxxs(NumberUtil.round(day.getGlyzxxs(), 2).doubleValue());
             peeidt.setDaynhyd(NumberUtil.round(day.getNhyd(), 2).doubleValue());
-            if (i != 1) {
-                double dxkyxs = (1200 * (i - 1) - day.getGzMin() / 60 - day.getJxMin() / 60) / (12 * (i - 1));
-                peeidt.setDaydxkyxs(NumberUtil.round(dxkyxs, 2).doubleValue());
-            }
+            double dxkyxs = (1200 * (i - 1) - day.getGzMin() / 60 - day.getJxMin() / 60) / (12 * (i - 1));
+            peeidt.setDaydxkyxs(NumberUtil.round(dxkyxs, 2).doubleValue());
+
         });
         return peeidtRecords;
     }