|
@@ -157,7 +157,10 @@ public class CarbonServiceImpl implements CarbonService {
|
|
|
Double totalHours = busMapper.getTotalHoursByCompanyIdAndDeptId(iocParam);
|
|
|
Integer totalBus = busMapper.getTotalBusByCompanyIdAndDeptId(iocParam);
|
|
|
Integer total = busMapper.getTotalByCompanyIdAndDeptId(iocParam);
|
|
|
- avgCost = Double.valueOf(decimalFormat.format(avgCost));
|
|
|
+ BigDecimal bigDecimal1 = new BigDecimal(avgCost);
|
|
|
+ BigDecimal avgCostDec = bigDecimal1.divide(new BigDecimal(365), 2, RoundingMode.HALF_UP);
|
|
|
+ avgCost = avgCostDec.doubleValue();
|
|
|
+ // avgCost = Double.valueOf(decimalFormat.format(avgCost));
|
|
|
Double totalCarbon = busMapper.getTotalCarbonByCompanyIdAndDeptId(iocParam);
|
|
|
double avgHours = 0d;
|
|
|
double avgCarbon = 0d;
|