|
@@ -1565,7 +1565,8 @@ public class BenchmarkingService {
|
|
|
vo.setXdssdl(DoubleUtils.keepPrecision((i.getXdss() + i.getDjss()) / 1000, 2));
|
|
vo.setXdssdl(DoubleUtils.keepPrecision((i.getXdss() + i.getDjss()) / 1000, 2));
|
|
|
vo.setSlssdl(DoubleUtils.keepPrecision(i.getSlss() / 1000, 2));
|
|
vo.setSlssdl(DoubleUtils.keepPrecision(i.getSlss() / 1000, 2));
|
|
|
vo.setXnssdl(DoubleUtils.keepPrecision(i.getXnss() / 1000, 2));
|
|
vo.setXnssdl(DoubleUtils.keepPrecision(i.getXnss() / 1000, 2));
|
|
|
- vo.setZssdl(DoubleUtils.keepPrecision((vo.getGzssdl() + vo.getJxssdl() + vo.getXdssdl() + vo.getXnssdl() + vo.getSlssdl()) / 1000, 2));
|
|
|
|
|
|
|
+// vo.setZssdl(DoubleUtils.keepPrecision((vo.getGzssdl() + vo.getJxssdl() + vo.getXdssdl() + vo.getXnssdl() + vo.getSlssdl()) / 1000, 2));
|
|
|
|
|
+ vo.setZssdl(DoubleUtils.keepPrecision((i.getGzss() + i.getJhjxss()+ i.getFjhjxss() + i.getXdss() + i.getXnss() + i.getSlss()) / 1000, 2));
|
|
|
vo.setFnlyl(vo.getLlfdl() != 0 ? DoubleUtils.keepPrecision(vo.getFdl() / vo.getLlfdl() * 100, 2) : 0);
|
|
vo.setFnlyl(vo.getLlfdl() != 0 ? DoubleUtils.keepPrecision(vo.getFdl() / vo.getLlfdl() * 100, 2) : 0);
|
|
|
vo.setGzssl(vo.getLlfdl() != 0 ? DoubleUtils.keepPrecision(vo.getGzssdl() / vo.getLlfdl() * 100, 2) : 0);
|
|
vo.setGzssl(vo.getLlfdl() != 0 ? DoubleUtils.keepPrecision(vo.getGzssdl() / vo.getLlfdl() * 100, 2) : 0);
|
|
|
vo.setJxssl(vo.getLlfdl() != 0 ? DoubleUtils.keepPrecision(vo.getJxssdl() / vo.getLlfdl() * 100, 2) : 0);
|
|
vo.setJxssl(vo.getLlfdl() != 0 ? DoubleUtils.keepPrecision(vo.getJxssdl() / vo.getLlfdl() * 100, 2) : 0);
|