绩效榜修改

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

@@ -246,7 +246,9 @@ public class BenchmarkingService {
             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());
 
-//            vo.setSpeed(BigDecimalUtils.divide(new BigDecimal(i.getRpjfs()), new BigDecimal(1), 2).doubleValue());
+            if (sttype.isEmpty()) {
+            vo.setSpeed(BigDecimalUtils.divide(new BigDecimal(i.getRpjfs()), new BigDecimal(1), 2).doubleValue());
+            }
             vo.setFjhjx(BigDecimalUtils.divide(new BigDecimal(i.getRgzssdl() + i.getRcnslgzssdl()), new BigDecimal(10000), 2).doubleValue());
             vo.setJhjx(BigDecimalUtils.divide(new BigDecimal(i.getRjxssdl() + i.getRcnsljxssdl()), new BigDecimal(10000), 2).doubleValue());
             vo.setXd(BigDecimalUtils.divide(new BigDecimal(i.getRxdtjssdl() + i.getRxdjclssdl()), new BigDecimal(10000), 2).doubleValue());
@@ -370,14 +372,38 @@ public class BenchmarkingService {
                 vo.setId(i.getWindpowerstationId());
                 vo.setName(CacheContext.wpmap.get(i.getWindpowerstationId().trim()).getAname());
                 vo.setOrdernum(CacheContext.wpmap.get(i.getWindpowerstationId().trim()).getOrderNum());
+
+                double quantity = CacheContext.wpmap.get(i.getWindpowerstationId().trim()).getJrwindQuantityLd()
+                        + CacheContext.wpmap.get(i.getWindpowerstationId().trim()).getJrquantityZc()
+                        + CacheContext.wpmap.get(i.getWindpowerstationId().trim()).getJrquantityJz();
+
+                if (getype.equals("-2")) {
+                    vo.setSpeed(DoubleUtils.keepPrecision(i.getRpjfs() / quantity, 2));
+                }else {
+                    vo.setSpeed(DoubleUtils.keepPrecision(i.getRpjfs(), 2));
+                }
             } else if (sttype.equals("2")) {
                 vo.setId(i.getProjectId());
                 vo.setName(CacheContext.pjmap.get(i.getProjectId().trim()).getAname());
                 vo.setOrdernum(CacheContext.pjmap.get(i.getProjectId().trim()).getOrderNum());
+
+                double quantity = CacheContext.pjmap.get(i.getProjectId().trim()).getQuantity();
+                if (getype.equals("-2")) {
+                    vo.setSpeed(DoubleUtils.keepPrecision(i.getRpjfs() /quantity, 2));
+                } else {
+                    vo.setSpeed(DoubleUtils.keepPrecision(i.getRpjfs(), 2));
+                }
             } else if (sttype.equals("3")) {
                 vo.setId(i.getLineId());
                 vo.setName(CacheContext.lnmap.get(i.getLineId().trim()).getAname());
                 vo.setOrdernum(CacheContext.lnmap.get(i.getLineId().trim()).getOrderNum());
+
+                double quantity = CacheContext.lnmap.get(i.getLineId().trim()).getQuantity();
+                if (getype.equals("-2")) {
+                    vo.setSpeed(DoubleUtils.keepPrecision(i.getRpjfs() / quantity, 2));
+                } else {
+                    vo.setSpeed(DoubleUtils.keepPrecision(i.getRpjfs(), 2));
+                }
             } else {
                 vo.setId(i.getWindturbineId());
                 vo.setName(CacheContext.wtmap.get(i.getWindturbineId().trim()).getAname());
@@ -385,7 +411,9 @@ public class BenchmarkingService {
             }
             vo.setSjfdl(DoubleUtils.keepPrecision(i.getRfdl() / 10000, 2));
             vo.setLlfdl(DoubleUtils.keepPrecision(i.getRllfdl() / 10000, 2));
+            if (sttype.isEmpty()) {
             vo.setSpeed(DoubleUtils.keepPrecision(i.getRpjfs(), 2));
+            }
             vo.setFjhjx1(DoubleUtils.keepPrecision(i.getRgzssdl() / 10000, 2));
             vo.setFjhjx2(DoubleUtils.keepPrecision(i.getRcnslgzssdl() / 10000, 2));
             vo.setJhjx1(DoubleUtils.keepPrecision(i.getRjxssdl() / 10000, 2));