风机排序问题

runeconomy-xk/src/main/java/com/gyee/runeconomy/service/BrownoutsEvent2Service.java

@@ -32,7 +32,6 @@ public class BrownoutsEvent2Service {
             LambdaQueryWrapper<ProEconBrownoutsEvent2> queryWrapper = new LambdaQueryWrapper<>();
             //添加过滤条件
 
-
             queryWrapper.eq(ProEconBrownoutsEvent2::getWindturbineId, wtId).
                     ge(ProEconBrownoutsEvent2::getStopTime, beginDate).
                     le(ProEconBrownoutsEvent2::getStopTime, endDate);

runeconomy-xk/src/main/java/com/gyee/runeconomy/service/WindDeviationService.java

@@ -709,7 +709,8 @@ public class WindDeviationService {
             if (com.gyee.common.model.StringUtils.notEmp(wpId)) {
                 QueryWrapper<ProEconEquipmentInfoDay4> queryWrapper = new QueryWrapper<>();
                 queryWrapper.eq("record_date", recordDate)
-                        .eq("windpowerstation_id", wpId);
+                        .eq("windpowerstation_id", wpId)
+                        .orderByAsc("windturbine_id");
 
                 iostls = proEconEquipmentInfoDay4Service.list(queryWrapper);
             }

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

@@ -87,7 +87,8 @@ public class TurbineInfoDayServiceImpl extends ServiceImpl<TurbineInfoDayMapper,
     public List<TurbineInfoDay> getTurbineMonthList(String windpowerstationId, LocalDate startDate, LocalDate endDate) {
         QueryWrapper<TurbineInfoDay> qw = new QueryWrapper<>();
         qw.eq("station_id", windpowerstationId)
-                .between("record_date", startDate, endDate)
+                .ge("record_date", startDate)
+                .lt("record_date", endDate)
                 .groupBy("turbine_id",
                         "to_char(record_date, 'yyyy-MM')" )
                 .orderByAsc("turbine_id")

runeconomy-xk/src/main/java/com/gyee/runeconomy/service/bmk/BenchmarkingService.java

@@ -1681,6 +1681,7 @@ public class BenchmarkingService {
             qw.eq("line_id", id);
         }
         qw.groupBy("turbine_id");
+        qw.orderByAsc("turbine_id");
         //        total = proEconEquipmentInfoDay1Service.count(qw);
         Map<String, Object> wxsslVoList = getWxsslSortVos(qw, total, resultList, TYPE_WINDTURBINE, pageNum, pageSize);
         if (StringUtils.isNotEmpty(target) && StringUtils.isNotEmpty(sort)) {

runeconomy-xk/src/main/java/com/gyee/runeconomy/service/outputspeed/OutputSpeedService.java

@@ -124,6 +124,7 @@ public class OutputSpeedService {
                 }
             }
 
+            queryWrapper.orderByAsc(ProEconInOrOutSpeedTotal::getRecordDate);
             //执行查询
             proEconInOrOutSpeedTotalService.page(pageInfo, queryWrapper);