From 7c50fe5b89eb4ffca7137ba2685b1a2bbcfcfc39 Mon Sep 17 00:00:00 2001 From: zhaoqiaobo <583671871@qq.com> Date: Wed, 18 Dec 2024 18:35:09 +0800 Subject: [PATCH] =?UTF-8?q?feat(all):=20=E6=9C=8D=E5=8A=A1=E5=95=86?= =?UTF-8?q?=E6=88=90=E6=9C=AC=E7=BB=B4=E6=8A=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 1 增加批量新增司机 --- .../impl/DistributionAddvaluePackageServiceImpl.java | 2 +- .../logpm/statistics/feign/ExpenseDispatchClient.java | 1 + .../mapper/ExpenseDispatchPriceServiceMapper.java | 2 +- .../mapper/ExpenseDispatchPriceServiceMapper.xml | 9 +++++++++ .../mapper/ExpenseDispatchPriceTemplateMapper.xml | 7 ++----- .../mapper/ExpenseDispatchTrainDetailMapper.xml | 5 ++++- .../mapper/ExpenseDispatchWarehouseMonthMapper.xml | 5 ++++- 7 files changed, 22 insertions(+), 9 deletions(-) diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionAddvaluePackageServiceImpl.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionAddvaluePackageServiceImpl.java index 1c33dfcdf..71f66a94c 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionAddvaluePackageServiceImpl.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionAddvaluePackageServiceImpl.java @@ -69,7 +69,7 @@ public class DistributionAddvaluePackageServiceImpl extends BaseServiceImpl findMapByPackageCode(Set collect1) { Map result = new HashMap<>(); List list = this.list(Wrappers.lambdaQuery() - .select(DistributionAddvaluePackageEntity::getAddvalueDetailId) + .select(DistributionAddvaluePackageEntity::getAddvalueDetailId, DistributionAddvaluePackageEntity::getOrderPackageCode) .in(DistributionAddvaluePackageEntity::getOrderPackageCode, collect1)); if (CollUtil.isNotEmpty(list)) { // 转map diff --git a/blade-service/logpm-statisticsdata/src/main/java/com/logpm/statistics/feign/ExpenseDispatchClient.java b/blade-service/logpm-statisticsdata/src/main/java/com/logpm/statistics/feign/ExpenseDispatchClient.java index d77477edc..b8fd9cb2c 100644 --- a/blade-service/logpm-statisticsdata/src/main/java/com/logpm/statistics/feign/ExpenseDispatchClient.java +++ b/blade-service/logpm-statisticsdata/src/main/java/com/logpm/statistics/feign/ExpenseDispatchClient.java @@ -76,6 +76,7 @@ public class ExpenseDispatchClient implements IExpenseDispatchClient { Wrappers.lambdaUpdate() .eq(ExpenseDispatchTrainDetailEntity::getId, trainDetailEntity.getId())); }else{ + entity.setSettlementStatus("未结算"); trainDetailService.save(entity); } } diff --git a/blade-service/logpm-statisticsdata/src/main/java/com/logpm/statistics/mapper/ExpenseDispatchPriceServiceMapper.java b/blade-service/logpm-statisticsdata/src/main/java/com/logpm/statistics/mapper/ExpenseDispatchPriceServiceMapper.java index a88ceaa9a..e5b38c8a9 100644 --- a/blade-service/logpm-statisticsdata/src/main/java/com/logpm/statistics/mapper/ExpenseDispatchPriceServiceMapper.java +++ b/blade-service/logpm-statisticsdata/src/main/java/com/logpm/statistics/mapper/ExpenseDispatchPriceServiceMapper.java @@ -40,7 +40,7 @@ public interface ExpenseDispatchPriceServiceMapper extends BaseMapper selectExpenseDispatchPriceServicePage(IPage page, ExpenseDispatchPriceServiceVO expenseDispatchPriceService); + List selectExpenseDispatchPriceServicePage(@Param("page") IPage page, @Param("expenseDispatchPriceService") ExpenseDispatchPriceServiceVO expenseDispatchPriceService); /** diff --git a/blade-service/logpm-statisticsdata/src/main/java/com/logpm/statistics/mapper/ExpenseDispatchPriceServiceMapper.xml b/blade-service/logpm-statisticsdata/src/main/java/com/logpm/statistics/mapper/ExpenseDispatchPriceServiceMapper.xml index d9aebd9d1..273947651 100644 --- a/blade-service/logpm-statisticsdata/src/main/java/com/logpm/statistics/mapper/ExpenseDispatchPriceServiceMapper.xml +++ b/blade-service/logpm-statisticsdata/src/main/java/com/logpm/statistics/mapper/ExpenseDispatchPriceServiceMapper.xml @@ -11,6 +11,15 @@ select t.*,t1.template_name as templateName from logpm_expense_dispatch_price_service t left join logpm_expense_dispatch_price_template t1 on t.template_id = t1.id where t.is_deleted = 0 and t1.is_deleted = 0 + + and t1.template_name like concat('%',#{expenseDispatchPriceService.templateName},'%') + + + and t.driver_name like concat('%',#{expenseDispatchPriceService.driverName},'%') + + + and t.warehouse_name like concat('%',#{expenseDispatchPriceService.warehouseName},'%') + diff --git a/blade-service/logpm-statisticsdata/src/main/java/com/logpm/statistics/mapper/ExpenseDispatchPriceTemplateMapper.xml b/blade-service/logpm-statisticsdata/src/main/java/com/logpm/statistics/mapper/ExpenseDispatchPriceTemplateMapper.xml index 29ae4df2e..e3d8e5b97 100644 --- a/blade-service/logpm-statisticsdata/src/main/java/com/logpm/statistics/mapper/ExpenseDispatchPriceTemplateMapper.xml +++ b/blade-service/logpm-statisticsdata/src/main/java/com/logpm/statistics/mapper/ExpenseDispatchPriceTemplateMapper.xml @@ -14,11 +14,8 @@ and warehouse_name like concat('%',#{vo.warehouseName},'%') - - and update_time >= #{query.updateTimeStart} - - - and update_time #{query.updateTimeEnd} + + and template_name like concat('%',#{vo.templateName},'%') diff --git a/blade-service/logpm-statisticsdata/src/main/java/com/logpm/statistics/mapper/ExpenseDispatchTrainDetailMapper.xml b/blade-service/logpm-statisticsdata/src/main/java/com/logpm/statistics/mapper/ExpenseDispatchTrainDetailMapper.xml index ead0723a1..bc9d2c827 100644 --- a/blade-service/logpm-statisticsdata/src/main/java/com/logpm/statistics/mapper/ExpenseDispatchTrainDetailMapper.xml +++ b/blade-service/logpm-statisticsdata/src/main/java/com/logpm/statistics/mapper/ExpenseDispatchTrainDetailMapper.xml @@ -11,7 +11,10 @@ select * from logpm_expense_dispatch_train_detail where is_deleted = 0 - and destination_warehouse = #{expenseDispatchTrainDetail.destinationWarehouse} + and destination_warehouse in + + #{item} + and settlement_status = #{expenseDispatchTrainDetail.settlementStatus} diff --git a/blade-service/logpm-statisticsdata/src/main/java/com/logpm/statistics/mapper/ExpenseDispatchWarehouseMonthMapper.xml b/blade-service/logpm-statisticsdata/src/main/java/com/logpm/statistics/mapper/ExpenseDispatchWarehouseMonthMapper.xml index 64d781b64..c105a65fd 100644 --- a/blade-service/logpm-statisticsdata/src/main/java/com/logpm/statistics/mapper/ExpenseDispatchWarehouseMonthMapper.xml +++ b/blade-service/logpm-statisticsdata/src/main/java/com/logpm/statistics/mapper/ExpenseDispatchWarehouseMonthMapper.xml @@ -11,7 +11,10 @@ select * from logpm_expense_dispatch_warehouse_month - and destination_warehouse = #{expenseDispatchWarehouseMonth.destinationWarehouse} + and destination_warehouse in + + #{item} + and settlement_year = #{expenseDispatchWarehouseMonth.settlementYear}