场际对标按场站排序

benchmarking-impala/src/main/java/com/gyee/benchmarkingimpala/service/BenchmarkingService.java

@@ -924,7 +924,7 @@ public class BenchmarkingService  {
                 SortUtils.sort(resultList,target,SortUtils.DESC);
             }
         }else {
-            SortUtils.sort(resultList,"fdl",SortUtils.ASC);
+            SortUtils.sort(resultList,"ordernum",SortUtils.ASC);
         }
         return wxsslVoList;
     }
@@ -1016,9 +1016,13 @@ public class BenchmarkingService  {
      */
     private List<WxsslVo> getWxsslSortVos(QueryWrapper<Equipmentdayinfo> qw, List<WxsslVo> resultList, String type) {
 
+        Map<String,Double> station =  windpowerstationService.list()
+                .stream().collect(Collectors.toMap(Windpowerstation::getId,Windpowerstation::getOrdernum));
+
         List<Equipmentdayinfo> list = equipmentdayinfoService.list(qw);
         list.stream().forEach(i->{
             WxsslVo vo = new WxsslVo();
+            vo.setOrdernum(station.get(i.getWindpowerstationid()));
             if (type.equals(TYPE_WIND)){
                 vo.setId(i.getWindpowerstationid());
                 vo.setName(CacheContext.wpmap.get(i.getWindpowerstationid().trim()).getName());
@@ -1100,6 +1104,7 @@ public class BenchmarkingService  {
         for (int i=0;i<resultList.size();i++){
             resultList.get(i).setSlsslpm(i+1);
         }
+
         return resultList;
     }