浏览代码

排序修改

王波 1 月之前
父节点
当前提交
ea459b5237

+ 2 - 2
runeconomy-xk/src/main/java/com/gyee/runeconomy/service/EarlyWarning/WindReportService.java

@@ -515,12 +515,12 @@ public class WindReportService {
             sylyxs_top[i] = StringUtils.round(syitem_top.getLyxs(), 2);
 
 
-            var item_bot = glyztopList.get(i);
+            var item_bot = glyzbottomList.get(i);
             glyz_botid[i] = item_bot.getStationId() != null ? item_bot.getStationId() : "";
             glyz_bot[i] = StringUtils.round(item_bot.getGlyzxxs(), 2);
             lyxs_bot[i] = StringUtils.round(item_bot.getLyxs(), 2);
 
-            var syitem_bot = syglyztopList.get(i);
+            var syitem_bot = syglyzbottomList.get(i);
             syglyz_botid[i] = syitem_bot.getStationId() != null ?syitem_bot.getStationId() : "";
             syglyz_bot[i] = StringUtils.round(syitem_bot.getGlyzxxs(), 2);
             sylyxs_bot[i] = StringUtils.round(syitem_bot.getLyxs(), 2);

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

@@ -357,7 +357,7 @@ public class TurbineInfoDayServiceImpl extends ServiceImpl<TurbineInfoDayMapper,
         monthqw.select("turbine_id,avg(klyl) as klyl"); // 按风机分组
         monthqw.eq("to_char(record_date,'yyyy-MM')", time);
         monthqw.groupBy("turbine_id"); // 按风机ID分组
-        monthqw.orderByAsc("sum(klyl)"); // 按总风能利用率降序排列
+        monthqw.orderByDesc("sum(klyl)"); // 按总风能利用率降序排列
         monthqw.last("LIMIT 3"); // 限制返回前3条记录
 
         List<TurbineInfoDay> monthList = baseMapper.selectList(monthqw);
@@ -383,7 +383,7 @@ public class TurbineInfoDayServiceImpl extends ServiceImpl<TurbineInfoDayMapper,
         monthqw.select("turbine_id,avg(glyzxxs) as glyzxxs, sum(lyxs) as lyxs"); // 按风机分组
         monthqw.eq("to_char(record_date,'yyyy-MM')", time);
         monthqw.groupBy("turbine_id"); // 按风机ID分组
-        monthqw.orderByAsc("sum(glyzxxs)");
+        monthqw.orderByDesc("sum(glyzxxs)");
         monthqw.last("LIMIT 3"); // 限制返回前3条记录
 
         List<TurbineInfoDay> monthList = baseMapper.selectList(monthqw);
@@ -414,7 +414,7 @@ public class TurbineInfoDayServiceImpl extends ServiceImpl<TurbineInfoDayMapper,
         monthqw.select("turbine_id,avg(glyzxxs) as glyzxxs, sum(lyxs) as lyxs"); // 按风机分组
         monthqw.eq("to_char(record_date,'yyyy-MM')", previousMonthStr);
         monthqw.groupBy("turbine_id"); // 按风机ID分组
-        monthqw.orderByAsc("sum(glyzxxs)");
+        monthqw.orderByDesc("sum(glyzxxs)");
         monthqw.last("LIMIT 3"); // 限制返回前3条记录
 
         List<TurbineInfoDay> monthList = baseMapper.selectList(monthqw);