wangb 1 semana atrás
pai
commit
53155d5f4e

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

@@ -1,5 +1,6 @@
 package com.gyee.runeconomy.service.auto.impl;
 
+import cn.hutool.core.date.DateField;
 import cn.hutool.core.date.DateTime;
 import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.util.NumberUtil;
@@ -66,8 +67,9 @@ public class ProEconEquipmentInfoDayTopServiceImpl extends ServiceImpl<ProEconEq
             Date recordDate = peeidt.getRecordDate();
             int i = DateUtil.dayOfMonth(recordDate);
             if (1 == i) {
-                DateTime dateTime = DateUtil.endOfMonth(recordDate);
-                i = DateUtil.dayOfMonth(dateTime);
+                DateTime offset = DateUtil.offset(recordDate, DateField.DAY_OF_MONTH, -1);
+                i = DateUtil.dayOfMonth(offset);
+                i = i + 1;
             }
             peeidt.setDayfdl(NumberUtil.round(day.getRfdl() / 1000, 2).doubleValue());
             peeidt.setDayllfdl(NumberUtil.round(day.getLlfdl() / 1000, 2).doubleValue());
@@ -87,7 +89,6 @@ public class ProEconEquipmentInfoDayTopServiceImpl extends ServiceImpl<ProEconEq
             peeidt.setDaynhyd(NumberUtil.round(day.getNhyd(), 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;
     }