对标默认排行

common/src/main/java/com/gyee/common/vo/benchmark/FjjxbVo.java

@@ -26,4 +26,5 @@ public class FjjxbVo  implements Serializable  {
     private Double xn;  //性能
     private Double fnlly;   //风能利用率
     private Double point;
+    private Integer ordernum;
 }

common/src/main/java/com/gyee/common/vo/benchmark/FjjxbmxVo.java

@@ -33,4 +33,5 @@ public class FjjxbmxVo implements Serializable {
     private Double xn4;   //缺陷降出
     private Double fnlly;   //风能利用率
     private Double point;
+    private Integer ordernum;
 }

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

@@ -140,15 +140,19 @@ public class BenchmarkingService {
             if (sttype.equals("1")){
                 vo.setId(i.getWindpowerstationId());
                 vo.setName(CacheContext.wpmap.get(i.getWindpowerstationId().trim()).getName());
+                vo.setOrdernum(CacheContext.wpmap.get(i.getWindpowerstationId().trim()).getOrderNum());
             }else if(sttype.equals("2")){
                 vo.setId(i.getProjectId());
                 vo.setName(CacheContext.pjmap.get(i.getProjectId().trim()).getName());
+                vo.setOrdernum(CacheContext.pjmap.get(i.getProjectId().trim()).getOrderNum());
             }else if(sttype.equals("3")){
                 vo.setId(i.getLineId());
                 vo.setName(CacheContext.lnmap.get(i.getLineId().trim()).getName());
+                vo.setOrdernum(CacheContext.lnmap.get(i.getLineId().trim()).getOrderNum());
             }else{
                 vo.setId(i.getWindturbineId());
                 vo.setName(CacheContext.wtmap.get(i.getWindturbineId().trim()).getName());
+                vo.setOrdernum(CacheContext.wtmap.get(i.getWindturbineId().trim()).getOrderNum());
             }
             vo.setSjfdl(BigDecimalUtils.divide(new BigDecimal(i.getRfdl()),new BigDecimal(10000),2).doubleValue());
             vo.setLlfdl(BigDecimalUtils.divide(new BigDecimal(i.getRllfdl()),new BigDecimal(10000),2).doubleValue());
@@ -173,6 +177,7 @@ public class BenchmarkingService {
             sl.updateAndGet(v -> new Double((double) (v + vo.getSl())));
             resultList.add(vo);
         });
+        SortUtils.sort(resultList,"ordernum",SortUtils.ASC);
         FjjxbVo vo = new FjjxbVo();
         vo.setId("hj");
         vo.setName("合计");
@@ -260,15 +265,19 @@ public class BenchmarkingService {
             if (sttype.equals("1")){
                 vo.setId(i.getWindpowerstationId());
                 vo.setName(CacheContext.wpmap.get(i.getWindpowerstationId().trim()).getName());
+                vo.setOrdernum(CacheContext.wpmap.get(i.getWindpowerstationId().trim()).getOrderNum());
             }else if(sttype.equals("2")){
                 vo.setId(i.getProjectId());
                 vo.setName(CacheContext.pjmap.get(i.getProjectId().trim()).getName());
+                vo.setOrdernum(CacheContext.pjmap.get(i.getProjectId().trim()).getOrderNum());
             }else if(sttype.equals("3")){
                 vo.setId(i.getLineId());
                 vo.setName(CacheContext.lnmap.get(i.getLineId().trim()).getName());
+                vo.setOrdernum(CacheContext.lnmap.get(i.getLineId().trim()).getOrderNum());
             }else{
                 vo.setId(i.getWindturbineId());
                 vo.setName(CacheContext.wtmap.get(i.getWindturbineId().trim()).getName());
+                vo.setOrdernum(CacheContext.wtmap.get(i.getWindturbineId().trim()).getOrderNum());
             }
             vo.setSjfdl(DoubleUtils.keepPrecision(i.getRfdl()/10000,2));
             vo.setLlfdl(DoubleUtils.keepPrecision(i.getRllfdl()/10000,2));
@@ -304,6 +313,7 @@ public class BenchmarkingService {
             sl2.updateAndGet(v -> new Double((double) (v + vo.getSl2())));
             resultList.add(vo);
         });
+        SortUtils.sort(resultList,"ordernum",SortUtils.ASC);
         FjjxbmxVo vo = new FjjxbmxVo();
         vo.setId("hj");
         vo.setName("合计");
@@ -588,7 +598,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;
     }
@@ -632,7 +642,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;
     }
@@ -739,7 +749,7 @@ public class BenchmarkingService {
         for (int i=0;i<resultList.size();i++){
             resultList.get(i).setSlsslpm(i+1);
         }
-
+        SortUtils.sort(resultList,"ordernum",SortUtils.ASC);
         return resultList;
     }
 
@@ -766,7 +776,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;
     }