From f12e8957ab7d21944796e64cfef8101f875181cc Mon Sep 17 00:00:00 2001 From: caoyizhong <1270296080@qq.com> Date: Wed, 31 Jan 2024 17:41:36 +0800 Subject: [PATCH] =?UTF-8?q?1.=E5=88=B0=E4=BB=98=E8=BF=90=E8=B4=B9=E3=80=81?= =?UTF-8?q?=E6=90=AC=E8=BF=90=E8=B4=B9=E3=80=81=E4=BB=93=E5=82=A8=E8=B4=B9?= =?UTF-8?q?=E3=80=81=E5=8F=89=E8=BD=A6=E8=B4=B9=E3=80=81=E5=85=B6=E4=BB=96?= =?UTF-8?q?=E5=A2=9E=E5=80=BC=E8=B4=B9=E7=94=A8=E3=80=81=E7=8A=B6=E6=80=81?= =?UTF-8?q?=E3=80=81=E8=AF=81=E6=8D=AE=E7=B1=BB=E5=9E=8B=E5=AF=BC=E5=87=BA?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E6=97=A0=E6=95=B0=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../logpm/distribution/vo/DistrilbutionBillLadingVO.java | 3 ++- .../mapper/DistrilbutionBillLadingMapper.xml | 1 + .../service/impl/DistrilbutionBillLadingServiceImpl.java | 9 +++++++-- 3 files changed, 10 insertions(+), 3 deletions(-) diff --git a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/DistrilbutionBillLadingVO.java b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/DistrilbutionBillLadingVO.java index cd6a3ee95..874f2671c 100644 --- a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/DistrilbutionBillLadingVO.java +++ b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/DistrilbutionBillLadingVO.java @@ -83,7 +83,8 @@ public class DistrilbutionBillLadingVO extends DistrilbutionBillLadingEntity { private String certificateTypeName; private List list; - + private String collectFee; + private String otherFee; } diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistrilbutionBillLadingMapper.xml b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistrilbutionBillLadingMapper.xml index d37f79d2b..7bda95f0d 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistrilbutionBillLadingMapper.xml +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistrilbutionBillLadingMapper.xml @@ -148,6 +148,7 @@ dbl.total_cost AS totalCost, dbl.pick_up_plate AS pickUpPlate, dbl.pickup_batch AS pickupBatch, + dbl.total_cost totalCost, count(DISTINCT ldbls.id ) AS stopNum FROM logpm_distrilbution_bill_lading dbl diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistrilbutionBillLadingServiceImpl.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistrilbutionBillLadingServiceImpl.java index 2268a8cf6..f1a59c480 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistrilbutionBillLadingServiceImpl.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistrilbutionBillLadingServiceImpl.java @@ -1168,9 +1168,14 @@ public class DistrilbutionBillLadingServiceImpl extends BaseServiceImpl listExcel = new ArrayList<>(); list.forEach(s -> { DistrilbutionBillLadingExcel excel = new DistrilbutionBillLadingExcel(); - s.setCertificateTypeName(DictBizCache.getValue(DictBizConstant.CERTIFICATE_TYPE, s.getCertificateTypeName())); + s.setCertificateTypeName(DictBizCache.getValue(DictBizConstant.CERTIFICATE_TYPE, s.getCertificateType())); + s.setConditionName(DictBizCache.getValue(DictBizConstant.BILL_CONDITIONS_STATUS, s.getConditions())); + s.setCollectFee(String.valueOf(s.getTotalCost())); + s.setTransport("0"); + s.setStorageFee("0"); + s.setForklift("0"); + s.setOtherFee("0"); BeanUtil.copyProperties(s, excel); - listExcel.add(excel); });