wangb 2 mēneši atpakaļ
vecāks
revīzija
537d0dbef6

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

@@ -80,6 +80,11 @@ public class ProEconEquipmentInfoDayTopServiceImpl extends ServiceImpl<ProEconEq
             peeidt.setDayRank(Integer.valueOf(day.getLevel()));
             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());
+            }
         });
         return peeidtRecords;
     }
@@ -252,6 +257,9 @@ public class ProEconEquipmentInfoDayTopServiceImpl extends ServiceImpl<ProEconEq
             peeidt.setDayyxfss(NumberUtil.round(day.getYxfss(), 2).doubleValue());
             peeidt.setDayjfpl(NumberUtil.round(day.getJfpl(), 2).doubleValue());
             peeidt.setDayglyzxxs(NumberUtil.round(day.getGlyzxxs(), 2).doubleValue());
+            peeidt.setDaynhyd(NumberUtil.round(day.getNhyd(), 2).doubleValue());
+            double dxkyxs = (1200 - day.getGzMin() / 60 - day.getJxMin() / 60) / 12;
+            peeidt.setDaydxkyxs(NumberUtil.round(dxkyxs, 2).doubleValue());
         });
         return peeidtRecords;
     }