wangb 3 ay önce
ebeveyn
işleme
6c8977ffc1

+ 3 - 7
runeconomy-xk/src/main/java/com/gyee/runeconomy/service/auto/impl/TurbineInfoDayServiceImpl.java

@@ -88,13 +88,9 @@ public class TurbineInfoDayServiceImpl extends ServiceImpl<TurbineInfoDayMapper,
         int dayOfMonth = endDate.getDayOfMonth();
         QueryWrapper<TurbineInfoDay> qw = new QueryWrapper<>();
         qw.eq("station_id", windpowerstationId)
-                .ge("record_date", startDate);
-        if (dayOfMonth == 1) {
-            qw.le("record_date", endDate);
-        }else {
-            qw.lt("record_date", endDate);
-        }
-        qw.groupBy("turbine_id", "to_char(record_date, 'yyyy-MM')")
+                .ge("record_date", startDate)
+                .le("record_date", endDate)
+        .groupBy("turbine_id", "to_char(record_date, 'yyyy-MM')")
                 .orderByAsc("turbine_id")
                 .select(
                         "turbine_id",