feat(all): 车次成本明细报表

1 修改报表逻辑

blade-service-api/logpm-statisticsdata-api/src/main/java/com/logpm/statistics/feign/IExpenseDispatchClient.java

@@ -17,7 +17,7 @@ public interface IExpenseDispatchClient {
 	String API_PREFIX = "expenseDispatch/client";
 
 	@GetMapping(API_PREFIX + "/findPriceByDriverId")
-	ExpenseDispatchClientDTO findPriceByDriverId(@RequestParam Long warehouseId, @RequestParam Long driverId, @RequestParam String carType, @RequestParam String dispatchType);
+	ExpenseDispatchClientDTO findPriceByDriverId(@RequestParam Long warehouseId, @RequestParam Long driverId, @RequestParam Long carType, @RequestParam String dispatchType);
 
 	@PostMapping(API_PREFIX + "/saveTrainDetailEntity")
 	void saveTrainDetailEntity(@RequestBody ExpenseDispatchTrainDetailEntity entity);

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/receiver/report/DeliverFinishReportListener.java

@@ -177,7 +177,7 @@ public class DeliverFinishReportListener implements ReportService {
 									if(StrUtil.isEmpty(qualityDeliverEntity.getSignCarType())){
 										continue;
 									}
-									ExpenseDispatchClientDTO expenseDispatchClientDTO = expenseDispatchClient.findPriceByDriverId(qualityDeliverEntity.getWarehouseId(), driverId, qualityDeliverEntity.getSignCarType(), qualityDeliverEntity.getDeliveryType());
+									ExpenseDispatchClientDTO expenseDispatchClientDTO = expenseDispatchClient.findPriceByDriverId(qualityDeliverEntity.getWarehouseId(), driverId, qualityDeliverEntity.getSignCarTypeId(), qualityDeliverEntity.getDeliveryType());
 									if (ObjectUtil.isNotEmpty(expenseDispatchClientDTO)) {
 										ExpenseDispatchPriceVO priceVO = expenseDispatchClientDTO.getPriceVO();
 										if (ObjectUtil.isEmpty(priceVO)) {

blade-service/logpm-statisticsdata/src/main/java/com/logpm/statistics/feign/ExpenseDispatchClient.java

@@ -1,6 +1,7 @@
 package com.logpm.statistics.feign;
 
 import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.convert.Convert;
 import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
@@ -36,7 +37,7 @@ public class ExpenseDispatchClient implements IExpenseDispatchClient {
 	private final IExpenseDispatchTrainDetailService trainDetailService;
 
 	@Override
-	public ExpenseDispatchClientDTO findPriceByDriverId(Long warehouseId, Long driverId, String carType, String dispatchType) {
+	public ExpenseDispatchClientDTO findPriceByDriverId(Long warehouseId, Long driverId, Long carType, String dispatchType) {
 		List<ExpenseDispatchPriceServiceEntity> list = serviceService.list(Wrappers.<ExpenseDispatchPriceServiceEntity>lambdaQuery()
 			.eq(ExpenseDispatchPriceServiceEntity::getWarehouseId, warehouseId)
 			.eq(ExpenseDispatchPriceServiceEntity::getDriverId, driverId)
@@ -53,7 +54,7 @@ public class ExpenseDispatchClient implements IExpenseDispatchClient {
 				dto.setRule(expenseDispatchPriceRuleDTO);
 			}
 			ExpenseDispatchPriceEntity param = new ExpenseDispatchPriceVO();
-			param.setCarModel(carType);
+			param.setCarModel(Convert.toStr(carType));
 			param.setTemplateId(templateId);
 			param.setType(StrUtil.equals(dispatchType, "商配") ? 1: 2);
 			ExpenseDispatchPriceVO detail = priceService.detail(param);