|
@@ -194,11 +194,11 @@ public class ThreeRateService {
|
|
|
|
|
|
vo.setOrdernum(station.size()+1);
|
|
|
|
|
|
- vo.setYfwcs(yfwcs.get());
|
|
|
- vo.setWfz(wfz.get());
|
|
|
- vo.setSfz(sfz.get());
|
|
|
- vo.setSwfz(swfz.get());
|
|
|
- vo.setEsfz(esfz.get());
|
|
|
+ vo.setYfwcs(DoubleUtils.getRoundingNum(yfwcs.get(), 2));
|
|
|
+ vo.setWfz(DoubleUtils.getRoundingNum(wfz.get(), 2));
|
|
|
+ vo.setSfz(DoubleUtils.getRoundingNum(sfz.get(), 2));
|
|
|
+ vo.setSwfz(DoubleUtils.getRoundingNum(swfz.get(), 2));
|
|
|
+ vo.setEsfz(DoubleUtils.getRoundingNum(esfz.get(), 2));
|
|
|
vo.setWfzfwl(vo.getYfwcs() != 0 ? DoubleUtils.getRoundingNum(vo.getWfz() / vo.getYfwcs() * 100, 2) : 0.0);
|
|
|
vo.setSfzfwl(vo.getYfwcs() != 0 ? DoubleUtils.getRoundingNum(vo.getSfz() / vo.getYfwcs() * 100, 2) : 0.0);
|
|
|
vo.setSwfzfwl(vo.getYfwcs() != 0 ? DoubleUtils.getRoundingNum(vo.getSwfz() / vo.getYfwcs() * 100, 2) : 0.0);
|
|
@@ -242,11 +242,11 @@ public class ThreeRateService {
|
|
|
vo.setWpid("合计");
|
|
|
|
|
|
vo.setOrdernum(station.size()+1);
|
|
|
- vo.setYfwcs(yfwcs.get());
|
|
|
- vo.setWfz(wfz.get());
|
|
|
- vo.setSfz(sfz.get());
|
|
|
- vo.setSwfz(swfz.get());
|
|
|
- vo.setEsfz(esfz.get());
|
|
|
+ vo.setYfwcs( DoubleUtils.getRoundingNum(yfwcs.get(), 2));
|
|
|
+ vo.setWfz( DoubleUtils.getRoundingNum(wfz.get(), 2));
|
|
|
+ vo.setSfz( DoubleUtils.getRoundingNum(sfz.get(), 2));
|
|
|
+ vo.setSwfz( DoubleUtils.getRoundingNum(swfz.get(), 2));
|
|
|
+ vo.setEsfz( DoubleUtils.getRoundingNum(esfz.get(), 2));
|
|
|
vo.setWfzfwl(vo.getYfwcs() != 0 ? DoubleUtils.getRoundingNum(vo.getWfz() / vo.getYfwcs() * 100, 2) : 0.0);
|
|
|
vo.setSfzfwl(vo.getYfwcs() != 0 ? DoubleUtils.getRoundingNum(vo.getSfz() / vo.getYfwcs() * 100, 2) : 0.0);
|
|
|
vo.setSwfzfwl(vo.getYfwcs() != 0 ? DoubleUtils.getRoundingNum(vo.getSwfz() / vo.getYfwcs() * 100, 2) : 0.0);
|
|
@@ -294,11 +294,11 @@ public class ThreeRateService {
|
|
|
vo.setOrdernum(station.size()+1);
|
|
|
|
|
|
|
|
|
- vo.setYfwcs(yfwcs.get());
|
|
|
- vo.setWfz(wfz.get());
|
|
|
- vo.setSfz(sfz.get());
|
|
|
- vo.setSwfz(swfz.get());
|
|
|
- vo.setEsfz(esfz.get());
|
|
|
+ vo.setYfwcs(DoubleUtils.getRoundingNum(yfwcs.get(), 2));
|
|
|
+ vo.setWfz(DoubleUtils.getRoundingNum(wfz.get(), 2));
|
|
|
+ vo.setSfz(DoubleUtils.getRoundingNum(sfz.get(), 2));
|
|
|
+ vo.setSwfz(DoubleUtils.getRoundingNum(swfz.get(), 2));
|
|
|
+ vo.setEsfz(DoubleUtils.getRoundingNum(esfz.get(), 2));
|
|
|
vo.setWfzfwl(vo.getYfwcs() != 0 ? DoubleUtils.getRoundingNum(vo.getWfz() / vo.getYfwcs() * 100, 2) : 0.0);
|
|
|
vo.setSfzfwl(vo.getYfwcs() != 0 ? DoubleUtils.getRoundingNum(vo.getSfz() / vo.getYfwcs() * 100, 2) : 0.0);
|
|
|
vo.setSwfzfwl(vo.getYfwcs() != 0 ? DoubleUtils.getRoundingNum(vo.getSwfz() / vo.getYfwcs() * 100, 2) : 0.0);
|
|
@@ -346,11 +346,11 @@ public class ThreeRateService {
|
|
|
FwjslDTO vo = new FwjslDTO();
|
|
|
vo.setWpid("合计");
|
|
|
vo.setOrdernum(station.size()+1);
|
|
|
- vo.setYfwcs(yfwcs.get());
|
|
|
- vo.setWfz(wfz.get());
|
|
|
- vo.setSfz(sfz.get());
|
|
|
- vo.setSwfz(swfz.get());
|
|
|
- vo.setEsfz(esfz.get());
|
|
|
+ vo.setYfwcs(DoubleUtils.getRoundingNum(yfwcs.get(), 2));
|
|
|
+ vo.setWfz(DoubleUtils.getRoundingNum(wfz.get(), 2));
|
|
|
+ vo.setSfz(DoubleUtils.getRoundingNum(sfz.get(), 2));
|
|
|
+ vo.setSwfz(DoubleUtils.getRoundingNum(swfz.get(), 2));
|
|
|
+ vo.setEsfz(DoubleUtils.getRoundingNum(esfz.get(), 2));
|
|
|
vo.setWfzfwl(vo.getYfwcs() != 0 ? DoubleUtils.getRoundingNum(vo.getWfz() / vo.getYfwcs() * 100, 2) : 0.0);
|
|
|
vo.setSfzfwl(vo.getYfwcs() != 0 ? DoubleUtils.getRoundingNum(vo.getSfz() / vo.getYfwcs() * 100, 2) : 0.0);
|
|
|
vo.setSwfzfwl(vo.getYfwcs() != 0 ? DoubleUtils.getRoundingNum(vo.getSwfz() / vo.getYfwcs() * 100, 2) : 0.0);
|