From 39ec4ff3ae9aae0d32912f5886f2d6dee4e021dd Mon Sep 17 00:00:00 2001 From: zhenghaoyu Date: Thu, 5 Dec 2024 11:26:05 +0800 Subject: [PATCH 1/3] =?UTF-8?q?1.=E5=B9=B2=E7=BA=BFbug=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/logpm/statistics/mapper/StatisticsOrderInfoMapper.xml | 4 ++-- .../com/logpm/statistics/vo/StatisticsPackageFeeInfoVO.java | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/blade-service/logpm-statisticsdata/src/main/java/com/logpm/statistics/mapper/StatisticsOrderInfoMapper.xml b/blade-service/logpm-statisticsdata/src/main/java/com/logpm/statistics/mapper/StatisticsOrderInfoMapper.xml index a8cae7c4c..1fcb6ca42 100644 --- a/blade-service/logpm-statisticsdata/src/main/java/com/logpm/statistics/mapper/StatisticsOrderInfoMapper.xml +++ b/blade-service/logpm-statisticsdata/src/main/java/com/logpm/statistics/mapper/StatisticsOrderInfoMapper.xml @@ -631,7 +631,7 @@ lsoi.brand brand, lsoi.waybill_id waybillId, lsoi.waybill_no waybillNo, - lsoi.order_code orderCode, + lww.order_no orderCode, lsoi.type_service typeService, lww.shipper shipper, lww.shipper_name shipperPerson, @@ -647,7 +647,7 @@ else 0 end as signStatus, - lww.sign_time signDate, + lww.sign_time signTime, lww.sign_num signNum, lww.create_time openTime, lww.departure departure, diff --git a/blade-service/logpm-statisticsdata/src/main/java/com/logpm/statistics/vo/StatisticsPackageFeeInfoVO.java b/blade-service/logpm-statisticsdata/src/main/java/com/logpm/statistics/vo/StatisticsPackageFeeInfoVO.java index f7e1f4d7f..8327323ef 100644 --- a/blade-service/logpm-statisticsdata/src/main/java/com/logpm/statistics/vo/StatisticsPackageFeeInfoVO.java +++ b/blade-service/logpm-statisticsdata/src/main/java/com/logpm/statistics/vo/StatisticsPackageFeeInfoVO.java @@ -43,7 +43,7 @@ public class StatisticsPackageFeeInfoVO implements Serializable { private BigDecimal deliveryOtherFee; private BigDecimal deliveryCrossingFee; - private Integer signNum; - private Date signTime;//最晚一条 +// private Integer signNum; +// private Date signTime;//最晚一条 } From 0098cc3a428dd81670edc15d58199b965f7faf77 Mon Sep 17 00:00:00 2001 From: PigBaoBei <2739175034@qq.com> Date: Thu, 5 Dec 2024 15:17:48 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E7=AD=BE=E6=94=B6=E5=88=97=E8=A1=A8BUG?= =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E3=80=81=E5=94=AE=E5=90=8E=E5=B7=A5=E5=8D=95?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=AF=BC=E5=87=BA=E6=97=B6=E9=97=B4=E9=99=90?= =?UTF-8?q?=E5=88=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/AftersalesWorkOrderServiceImpl.java | 15 ++++++++++++++- .../mapper/DistributionSignforMapper.xml | 10 +++++----- .../impl/DistributionStockupServiceImpl.java | 1 + 3 files changed, 20 insertions(+), 6 deletions(-) diff --git a/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/service/impl/AftersalesWorkOrderServiceImpl.java b/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/service/impl/AftersalesWorkOrderServiceImpl.java index 021c0ba93..a6a646f7c 100644 --- a/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/service/impl/AftersalesWorkOrderServiceImpl.java +++ b/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/service/impl/AftersalesWorkOrderServiceImpl.java @@ -16,6 +16,8 @@ */ package com.logpm.aftersales.service.impl; +import cn.hutool.core.date.DateUnit; +import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.ObjectUtil; import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; @@ -2736,6 +2738,7 @@ public class AftersalesWorkOrderServiceImpl extends BaseServiceImpl exportData = baseMapper.getBasicExportData(workOrderDTO, ids, warehouseIds); return exportData; } diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionSignforMapper.xml b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionSignforMapper.xml index 307ebf9ac..104ee2c15 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionSignforMapper.xml +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionSignforMapper.xml @@ -404,19 +404,19 @@ withoutScanning, lds.reservation_id reservationId, CASE lddl.kind - WHEN '1' THEN (SELECT driver_phone FROM logpm_distribution_delivery_self AS ldds WHERE ldds.delivery_id= lddl.id + WHEN '1' THEN (SELECT GROUP_CONCAT(driver_phone) FROM logpm_distribution_delivery_self AS ldds WHERE ldds.delivery_id= lddl.id AND ldds.is_deleted = 0 AND ldds.is_master = 2) - WHEN '2' THEN (SELECT driver_phone FROM logpm_distribution_delivery_tripartite AS lddt WHERE lddt.delivery_id= + WHEN '2' THEN (SELECT GROUP_CONCAT(driver_phone) FROM logpm_distribution_delivery_tripartite AS lddt WHERE lddt.delivery_id= lddl.id AND lddt.is_deleted = 0) ELSE '' END driverPhone FROM logpm_distribution_signfor lds - JOIN logpm_distribution_delivery_list lddl ON lddl.id = lds.delivery_id - JOIN logpm_distribution_reservation ldr ON ldr.id = lds.reservation_id + JOIN logpm_distribution_delivery_list lddl ON lddl.id = lds.delivery_id AND lddl.is_deleted = 0 AND lddl.customers_number > 0 + JOIN logpm_distribution_reservation ldr ON ldr.id = lds.reservation_id AND ldr.is_deleted = 0 AND ldr.reservation_status != 40 - lds.is_deleted = 0 and ldr.is_deleted = 0 and lddl.is_deleted = 0 AND (ldr.reservation_num + + lds.is_deleted = 0 AND (ldr.reservation_num + ldr.reservation_stock_list_num) > 0 AND lddl.customers_number > 0 and ldr.mall_name like concat('%',#{param.mallName},'%') diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionStockupServiceImpl.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionStockupServiceImpl.java index db2136383..f12fc09ae 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionStockupServiceImpl.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionStockupServiceImpl.java @@ -3941,6 +3941,7 @@ public class DistributionStockupServiceImpl extends BaseServiceImpl Date: Thu, 5 Dec 2024 15:23:36 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E7=AD=BE=E6=94=B6=E5=88=97=E8=A1=A8BUG?= =?UTF-8?q?=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/logpm/distribution/mapper/DistributionSignforMapper.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionSignforMapper.xml b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionSignforMapper.xml index 104ee2c15..e1591cfd0 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionSignforMapper.xml +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionSignforMapper.xml @@ -1864,7 +1864,7 @@ GROUP_CONCAT(DISTINCT t.driverName ) AS driverName, GROUP_CONCAT(DISTINCT t.carNumber ) AS carNumber, GROUP_CONCAT(DISTINCT t.deliveryTime ) AS deliveryTime, - now() AS signTime, + lds.signing_time AS signTime, GROUP_CONCAT(DISTINCT t.loadingUser ) AS loadingUser, GROUP_CONCAT(DISTINCT t.signUser ) AS signUser, GROUP_CONCAT(DISTINCT t.signOrderCode) AS signOrderCode,