qichexitong/car-system-api
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix-维修月度分析单车成本

Browse Source
This commit is contained in:
xl
2024-07-30 10:40:42 +08:00
parent 614f3dc6ec
commit 419e864bdb
2 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lxk-admin/src/main/java/com/zbkj/admin/service/impl/HomeServiceImpl.java
View File

@@ -365,7 +365,7 @@ public class HomeServiceImpl implements HomeService {
response.setAverage(avg);
response.setAverageModel(avgModel);
response.setAverageModel(avgCompany);
response.setAverageCompany(avgCompany);
return response;
}

12
lxk-service/src/main/java/com/zbkj/service/service/impl/CarReservationOrderServiceImpl.java
View File

@@ -4614,7 +4614,7 @@ public class CarReservationOrderServiceImpl extends ServiceImpl<CarReservationOr
if (profit == null) {
return BigDecimal.ZERO;
}
return profit.divide(new BigDecimal(orderList.size())).setScale(2, BigDecimal.ROUND_DOWN);
return profit.divide(new BigDecimal(orderList.size()), 2, BigDecimal.ROUND_DOWN);
}
@Override
@@ -4944,7 +4944,7 @@ public class CarReservationOrderServiceImpl extends ServiceImpl<CarReservationOr
}
}
List<CarDealer> carDealerList = carDealerService.listByIds(carNoJoinProfit.keySet());
List<CarDealer> carDealerList = carDealerService.listByIds(carDealerMap.keySet());
for (CarDealer dealer : carDealerList) {
BusinessAnalysisVo vo = new BusinessAnalysisVo();
vo.setId(dealer.getId());
@@ -5039,7 +5039,7 @@ public class CarReservationOrderServiceImpl extends ServiceImpl<CarReservationOr
}
}
List<VehicleModel> vehicleModelList = vehicleModelService.listByIds(carNoJoinProfit.keySet());
List<VehicleModel> vehicleModelList = vehicleModelService.listByIds(modelMap.keySet());
for (VehicleModel model : vehicleModelList) {
BusinessAnalysisVo vo = new BusinessAnalysisVo();
vo.setId(model.getId());
@@ -5049,7 +5049,7 @@ public class CarReservationOrderServiceImpl extends ServiceImpl<CarReservationOr
if (price == null || num == null || num.compareTo(BigDecimal.ZERO) == 0) {
vo.setCurrentData(BigDecimal.ZERO);
} else {
vo.setCurrentData(price.divide(num).setScale(2, BigDecimal.ROUND_DOWN));
vo.setCurrentData(price.divide(num,2, BigDecimal.ROUND_DOWN));
}
resp.put(model.getId(), vo);
}
@@ -5101,7 +5101,7 @@ public class CarReservationOrderServiceImpl extends ServiceImpl<CarReservationOr
if (cost == null) {
return BigDecimal.ZERO;
}
return cost.divide(new BigDecimal(orderList.size())).setScale(2, BigDecimal.ROUND_DOWN);
return cost.divide(new BigDecimal(orderList.size()), BigDecimal.ROUND_DOWN);
}
private CompletableFuture<Map<Integer, BusinessAnalysisVo>> profitAverageModelTask(MonthlyMaintenanceAnalysis request, String dateOffset) {
@@ -5209,7 +5209,7 @@ public class CarReservationOrderServiceImpl extends ServiceImpl<CarReservationOr
if (num == null || num.compareTo(BigDecimal.ZERO) < 1 || closingPrice == null) {
return BigDecimal.ZERO;
}
return closingPrice.divide(num).setScale(2, BigDecimal.ROUND_DOWN);
return closingPrice.divide(num, 2, BigDecimal.ROUND_DOWN);
}
private CompletableFuture<BigDecimal> accessoryTask(MonthlyMaintenanceAnalysis request, String dateOffset) {