From d4d543145ed90171a17eaec81d0edfb20d185ba7 Mon Sep 17 00:00:00 2001 From: "0.0" <1092404103.qq.com> Date: Mon, 3 Jul 2023 18:03:42 +0800 Subject: [PATCH] =?UTF-8?q?1.=E5=BE=85=E7=AD=BE=E6=94=B6=E9=A1=B5=E9=9D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../entity/DistributionSignforEntity.java | 32 ++- .../feign/IDistributionStockupInfoClient.java | 2 +- .../vo/DistributionSignforsnmbVO.java | 24 +-- .../DistributionSignforController.java | 1 - .../mapper/DistributionSignforMapper.java | 16 +- .../mapper/DistributionSignforMapper.xml | 199 +++++++++++++++++- .../impl/DistributionSignforServiceImpl.java | 23 +- 7 files changed, 250 insertions(+), 47 deletions(-) diff --git a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/entity/DistributionSignforEntity.java b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/entity/DistributionSignforEntity.java index 91c62c989..733278373 100644 --- a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/entity/DistributionSignforEntity.java +++ b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/entity/DistributionSignforEntity.java @@ -96,7 +96,22 @@ public class DistributionSignforEntity extends TenantEntity { * 服务类型 */ @ApiModelProperty(value = "服务类型;预约服务类型；1-上楼、2-超区、3-拆样、4-平移、5-分拣、6-搬运、7-返货；") - private String serveType; + private String deliveryWay; + /** + * 配送类型 + */ + @ApiModelProperty(value = "配送类型；1-商配、2-市配") + private String deliveryType; + /** + * 商城名称 + */ + @ApiModelProperty(value = "商城名称") + private String shoppingName; + /** + * 订单来源 + */ + @ApiModelProperty(value = "订单来源") + private String orderSource; /** * 配送仓库(id) */ @@ -170,10 +185,15 @@ public class DistributionSignforEntity extends TenantEntity { @ApiModelProperty(value = "签收人(名称)") private String signeeName; /** - * 签收状态;1-未签收,2-司机签收,3-文员签收 + * 文员签收状态;1-未签收，2-签收 */ - @ApiModelProperty(value = "签收状态;1-未签收,2-司机签收,3-文员签收") + @ApiModelProperty(value = "文员签收状态;1-未签收，2-签收") private String signingStatus; + /** + * 司机签收状态;1-未签收，2-签收 + */ + @ApiModelProperty(value = "司机签收状态;1-未签收，2-签收") + private String driverSigning; /** * 签收类型;1-签收,2-代签收 */ @@ -210,6 +230,12 @@ public class DistributionSignforEntity extends TenantEntity { @ApiModelProperty(value = "送货车辆(值)") private String deliveryVehicleName; + /** + * 编号 + */ + @ApiModelProperty(value = "编号") + private String number; + /** * 配送时间 diff --git a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/feign/IDistributionStockupInfoClient.java b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/feign/IDistributionStockupInfoClient.java index 9d48c459b..3cd94e481 100644 --- a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/feign/IDistributionStockupInfoClient.java +++ b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/feign/IDistributionStockupInfoClient.java @@ -33,7 +33,7 @@ import org.springframework.web.bind.annotation.RequestParam; ) public interface IDistributionStockupInfoClient { - String API_PREFIX = "/client"; + String API_PREFIX = "reservationStockup/client"; String TOP = API_PREFIX + "/top"; /** diff --git a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/DistributionSignforsnmbVO.java b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/DistributionSignforsnmbVO.java index b79928e5a..a77bef926 100644 --- a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/DistributionSignforsnmbVO.java +++ b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/DistributionSignforsnmbVO.java @@ -13,27 +13,15 @@ import lombok.Data; public class DistributionSignforsnmbVO { /** - * 客户总数 + * 司机待签收 */ - @ApiModelProperty(value = "客户总数") - private Integer customNub; + @ApiModelProperty(value = "司机待签收") + private Integer driverNub; /** - * 订单总数 + * 文员待签收 */ - @ApiModelProperty(value = "订单总数") - private Integer ordersNub; - - /** - * 已签收总数 - */ - @ApiModelProperty(value = "已签收总数") - private Integer signedNub; - /** - * 未签收总数 - */ - @ApiModelProperty(value = "未签收总数") - private Integer unsignedNub; - + @ApiModelProperty(value = "文员待签收") + private Integer clerkNub; } diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/controller/DistributionSignforController.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/controller/DistributionSignforController.java index 2e787e528..04b17f822 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/controller/DistributionSignforController.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/controller/DistributionSignforController.java @@ -116,7 +116,6 @@ public class DistributionSignforController extends BladeController { @ApiOperationSupport(order = 3) @ApiOperation(value = "分页", notes = "传入distributionSignfor") public R> page(DistributionSignforVO distributionSignfor, Query query) { - IPage pages = distributionSignforService.selectDistributionSignforPage(Condition.getPage(query), distributionSignfor); return R.data(pages); } diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionSignforMapper.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionSignforMapper.java index a9995e8b2..f0dd1c313 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionSignforMapper.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionSignforMapper.java @@ -41,7 +41,7 @@ public interface DistributionSignforMapper extends BaseMapper selectDistributionSignforPage(IPage page, DistributionSignforVO distributionSignfor); + List selectDistributionSignforPage(IPage page,@Param("param") DistributionSignforVO distributionSignfor); /** @@ -79,4 +79,18 @@ public interface DistributionSignforMapper extends BaseMapper selectCustomNub(DistributionSignforDTO distributionSignfor); + /** + * 司机未签收 + * + * @param distributionSignfor + * @return + */ + Integer selectdriverNubCount(@Param("param") DistributionSignforDTO distributionSignfor); + /** + * 文员未签收 + * + * @param distributionSignfor + * @return + */ + Integer selectclerkNubCount(@Param("param") DistributionSignforDTO distributionSignfor); } 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 f98112f02..a8b68eb29 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 @@ -20,19 +20,22 @@ - + + - - + + - + + - + + @@ -43,8 +46,94 @@ - + SELECT + id id, + number number, + order_id orderId, + reservation_id reservationId, + consignee_id consigneeId, + consignee_name consigneeName, + delivery_phone deliveryPhone, + delivery_address delivery_Address, + delivery_type deliveryType, + delivery_way deliveryWay, + warehouse_name warehouseName, + warehouse_id warehouseId, + train_number trainNumber, + order_total orderTotal, + total total, + loaded_number loadedNumber, + received_quantity receivedQuantity, + delivery_driver_name deliveryDriverName, + delivery_driver_id deliveryDriverId, + delivery_driver_phone deliveryDriverPhone, + signing_time signingTime, + sjsigning_time sjsigningTime, + signee_name signeeName, + signee_id signeeId, + signing_status signingStatus, + driver_signing driverSigning, + signing_type signingType, + clerk_sign_pictures clerkSignPictures, + delivery_sign_pictures deliverySignPictures, + service_number serviceNumber, + notes notes, + delivery_time deliveryTime, + delivery_vehicle_id deliveryVehicleId, + delivery_vehicle_name deliveryVehicleName, + shopping_name shoppingName, + order_source orderSource + FROM + logpm_distribution_signfor + + is_deleted = 0 + + and number like concat('%',#{param.number},'%') + + + and shopping_name like concat('%',#{param.shoppingName},'%') + + + and date_format(delivery_time,'%y%m%d%') = date_format(#{param.deliveryTime},'%y%m%d%') + + + and date_format(signing_time,'%y%m%d%') = date_format(#{param.signingTime},'%y%m%d%') + + + and date_format(sjsigning_time,'%y%m%d%') = date_format(#{param.sjsigningTime},'%y%m%d%') + + + and order_id like concat('%',#{param.orderId},'%') + + + and consignee_name like concat('%',#{param.consigneeName},'%') + + + and delivery_type = #{param.deliveryType} + + + and signing_status = #{param.signingStatus} + + + and order_source = #{param.orderSource} + + + and delivery_phone = #{param.deliveryPhone} + + + and train_number like concat('%',#{param.trainNumber},'%') + + + and delivery_driver_name like concat('%',#{param.deliveryDriverName},'%') + + + and delivery_address like concat('%',#{param.deliveryAddress},'%') + + + and driver_signing = #{param.driverSigning} + + @@ -63,5 +152,101 @@ + + diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionSignforServiceImpl.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionSignforServiceImpl.java index 5ad0ad46e..1a2f7fda5 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionSignforServiceImpl.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionSignforServiceImpl.java @@ -16,6 +16,7 @@ */ package com.logpm.distribution.service.impl; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.logpm.distribution.dto.DistributionSignforDTO; import com.logpm.distribution.entity.DistributionSignforEntity; import com.logpm.distribution.vo.DistributionSignforVO; @@ -59,23 +60,13 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl distributionSignforEntityList = baseMapper.selectCustomNub(distributionSignfor); - //订单总数 - Integer OrdersNub = baseMapper.selectOrdersNub(distributionSignfor); - //已签收总数 - Integer SignedNub = baseMapper.selectSignedNub(distributionSignfor); -// //未签收总数 -// Integer UnsignedNub = baseMapper.selectUnsignedNub(distributionSignfor); - distributionSignforsnmbVO.setCustomNub(distributionSignforEntityList.size()); - distributionSignforsnmbVO.setOrdersNub(OrdersNub); - distributionSignforsnmbVO.setUnsignedNub(OrdersNub - SignedNub); - distributionSignforsnmbVO.setSignedNub(SignedNub); + //司机待签收 + Integer driverNub = baseMapper.selectdriverNubCount(distributionSignfor); + //文员待签收 + Integer clerkNub = baseMapper.selectclerkNubCount(distributionSignfor); + distributionSignforsnmbVO.setClerkNub(clerkNub); + distributionSignforsnmbVO.setDriverNub(driverNub); return distributionSignforsnmbVO; }