From 2cde2a864e7363c073e395d2ed3efec756f7373c Mon Sep 17 00:00:00 2001 From: "0.0" <1092404103.qq.com> Date: Fri, 16 Jun 2023 18:05:57 +0800 Subject: [PATCH] =?UTF-8?q?1.=E7=94=9F=E6=88=90=E9=A2=84=E7=BA=A6=E5=88=97?= =?UTF-8?q?=E8=A1=A8=202.=E6=97=B6=E9=97=B4=E8=BD=AC=E6=8D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../DistributionDeliveryListEntity.java | 147 ++++++++++++++ .../entity/DistributionSigndetailEntity.java | 15 +- .../entity/DistributionSignforEntity.java | 17 +- .../IDistributionDeliveryListClient.java | 50 +++++ .../vo/DistributionDeliveryListVO.java | 42 ++++ .../vo/DistributionSigndetailVO.java | 8 +- .../DistributionDeliveryListController.java | 154 +++++++++++++++ .../DistributionSigndetailController.java | 2 + .../DistributionSignforController.java | 1 + .../dto/DistributionDeliveryListDTO.java | 34 ++++ .../excel/DistributionDeliveryListExcel.java | 184 ++++++++++++++++++ .../feign/DistributionDeliveryListClient.java | 53 +++++ .../DistributionDeliveryListMapper.java | 54 +++++ .../mapper/DistributionDeliveryListMapper.xml | 49 +++++ .../mapper/DistributionSigndetailMapper.xml | 17 +- .../IDistributionDeliveryListService.java | 58 ++++++ .../DistributionDeliveryListServiceImpl.java | 64 ++++++ .../DistributionSigndetailServiceImpl.java | 7 + 18 files changed, 943 insertions(+), 13 deletions(-) create mode 100644 blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/entity/DistributionDeliveryListEntity.java create mode 100644 blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/feign/IDistributionDeliveryListClient.java create mode 100644 blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/DistributionDeliveryListVO.java create mode 100644 blade-service/logpm-distribution/src/main/java/com/logpm/distribution/controller/DistributionDeliveryListController.java create mode 100644 blade-service/logpm-distribution/src/main/java/com/logpm/distribution/dto/DistributionDeliveryListDTO.java create mode 100644 blade-service/logpm-distribution/src/main/java/com/logpm/distribution/excel/DistributionDeliveryListExcel.java create mode 100644 blade-service/logpm-distribution/src/main/java/com/logpm/distribution/feign/DistributionDeliveryListClient.java create mode 100644 blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionDeliveryListMapper.java create mode 100644 blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionDeliveryListMapper.xml create mode 100644 blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/IDistributionDeliveryListService.java create mode 100644 blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionDeliveryListServiceImpl.java diff --git a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/entity/DistributionDeliveryListEntity.java b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/entity/DistributionDeliveryListEntity.java new file mode 100644 index 000000000..53d1b7f38 --- /dev/null +++ b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/entity/DistributionDeliveryListEntity.java @@ -0,0 +1,147 @@ +/* + * Copyright (c) 2018-2028, Chill Zhuang All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * + * Redistributions of source code must retain the above copyright notice, + * this list of conditions and the following disclaimer. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * Neither the name of the dreamlu.net developer nor the names of its + * contributors may be used to endorse or promote products derived from + * this software without specific prior written permission. + * Author: Chill 庄骞 (smallchill@163.com) + */ +package com.logpm.distribution.entity; + +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import java.util.Date; +import java.math.BigDecimal; +import lombok.EqualsAndHashCode; +import org.springblade.core.tenant.mp.TenantEntity; + +/** + * 配送管理 实体类 + * + * @author lmy + * @since 2023-06-16 + */ +@Data +@TableName("logpm_distribution_delivery_list") +@ApiModel(value = "DistributionDeliveryList对象", description = "配送管理") +@EqualsAndHashCode(callSuper = true) +public class DistributionDeliveryListEntity extends TenantEntity { + + /** + * 预留1 + */ + @ApiModelProperty(value = "预留1") + private String reserve1; + /** + * 预留2 + */ + @ApiModelProperty(value = "预留2") + private String reserve2; + /** + * 预留3 + */ + @ApiModelProperty(value = "预留3") + private String reserve3; + /** + * 预留4 + */ + @ApiModelProperty(value = "预留4") + private String reserve4; + /** + * 预留5 + */ + @ApiModelProperty(value = "预留5") + private String reserve5; + /** + * 车次 + */ + @ApiModelProperty(value = "车次") + private String trainNumber; + /** + * 仓库 + */ + @ApiModelProperty(value = "仓库") + private String warehouse; + /** + * 配送类型;1-市配,2-商配 + */ + @ApiModelProperty(value = "配送种类;1-市配,2-商配") + private String type; + + /** + * 配送种类;1-自主配送,2-三方配送 + */ + @ApiModelProperty(value = "配送类型;1-自主配送,2-三方配送") + private String kind; + /** + * 配送车辆 + */ + @ApiModelProperty(value = "配送车辆") + private String vehicle; + /** + * 配送司机 + */ + @ApiModelProperty(value = "配送司机") + private String driver; + /** + * 配送公司;1-货拉拉,2-京东 + */ + @ApiModelProperty(value = "配送公司;1-货拉拉,2-京东") + private String distributionCompany; + /** + * 配送状态;1-配送中,2-已完成 + */ + @ApiModelProperty(value = "配送状态;1-配送中,2-已完成") + private String state; + /** + * 配送客户数 + */ + @ApiModelProperty(value = "配送客户数") + private Integer customersNumber; + /** + * 配送价格 + */ + @ApiModelProperty(value = "配送价格") + private BigDecimal price; + /** + * 增值服务表id + */ + @ApiModelProperty(value = "增值服务表id") + private Integer addedServicesId; + /** + * 订单总数 + */ + @ApiModelProperty(value = "订单总数") + private Integer orderNumber; + /** + * 配送件数 + */ + @ApiModelProperty(value = "配送件数") + private Integer deliveryNumber; + /** + * 扫描件数 + */ + @ApiModelProperty(value = "扫描件数") + private Integer scannedNumber; + /** + * 装卸班组 + */ + @ApiModelProperty(value = "装卸班组") + private String loadingTeam; + /** + * 预约表id + */ + @ApiModelProperty(value = "预约表id") + private String reservationId; + +} diff --git a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/entity/DistributionSigndetailEntity.java b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/entity/DistributionSigndetailEntity.java index 1c9e396c8..4cd3104a6 100644 --- a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/entity/DistributionSigndetailEntity.java +++ b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/entity/DistributionSigndetailEntity.java @@ -114,14 +114,15 @@ public class DistributionSigndetailEntity extends TenantEntity { * 入库时间 */ @ApiModelProperty(value = "入库时间") - @JsonFormat(shape = JsonFormat.Shape.STRING, pattern="yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") - private Date warehousingTime; +// @JsonFormat(shape = JsonFormat.Shape.STRING, pattern="yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") +// @DateTimeFormat(pattern="yyyy-MM-dd HH:ss:mm") + private String warehousingTime; /** * 备货时间 */ @ApiModelProperty(value = "备货时间") - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8") - private Date leadTime; +// @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8") + private String leadTime; /** * 在库时长;(天) */ @@ -148,4 +149,10 @@ public class DistributionSigndetailEntity extends TenantEntity { @ApiModelProperty(value = "品牌") private String brand; + /** + * 查询创建时间 + */ + @ApiModelProperty(value = "品牌") + private String createTime_query; + } 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 0c13eb2ee..5cb8bcb0a 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 @@ -136,14 +136,14 @@ public class DistributionSignforEntity extends TenantEntity { * 签收时间 */ @ApiModelProperty(value = "签收时间") - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8") - private Date signingTime; +// @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8") + private String signingTime; /** * 司机签收时间 */ @ApiModelProperty(value = "司机签收时间") - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8") - private Date sjsigningTime; +// @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8") + private String sjsigningTime; /** * 签收人 */ @@ -180,4 +180,13 @@ public class DistributionSignforEntity extends TenantEntity { @ApiModelProperty(value = "备注") private String notes; + + /** + * 配送时间 + */ + @ApiModelProperty(value = "配送时间") +// @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8") + private String deliveryTime; + + } diff --git a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/feign/IDistributionDeliveryListClient.java b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/feign/IDistributionDeliveryListClient.java new file mode 100644 index 000000000..10e3f253a --- /dev/null +++ b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/feign/IDistributionDeliveryListClient.java @@ -0,0 +1,50 @@ +/* + * Copyright (c) 2018-2028, Chill Zhuang All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * + * Redistributions of source code must retain the above copyright notice, + * this list of conditions and the following disclaimer. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * Neither the name of the dreamlu.net developer nor the names of its + * contributors may be used to endorse or promote products derived from + * this software without specific prior written permission. + * Author: Chill 庄骞 (smallchill@163.com) + */ +package com.logpm.distribution.feign; + +import org.springblade.common.constant.ModuleNameConstant; +import org.springblade.core.mp.support.BladePage; +import com.logpm.distribution.entity.DistributionDeliveryListEntity; +import org.springframework.cloud.openfeign.FeignClient; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestParam; + +/** + * 配送管理 Feign接口类 + * + * @author lmy + * @since 2023-06-16 + */ +@FeignClient( + value = ModuleNameConstant.APPLICATION_DISTRIBUTION_NAME +) +public interface IDistributionDeliveryListClient { + + String API_PREFIX = "deliveryList/client"; + String TOP = API_PREFIX + "/top"; + + /** + * 获取配送管理列表 + * + * @param current 页号 + * @param size 页数 + * @return BladePage + */ + @GetMapping(TOP) + BladePage top(@RequestParam("current") Integer current, @RequestParam("size") Integer size); + +} diff --git a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/DistributionDeliveryListVO.java b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/DistributionDeliveryListVO.java new file mode 100644 index 000000000..15346aa16 --- /dev/null +++ b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/DistributionDeliveryListVO.java @@ -0,0 +1,42 @@ +/* + * Copyright (c) 2018-2028, Chill Zhuang All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * + * Redistributions of source code must retain the above copyright notice, + * this list of conditions and the following disclaimer. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * Neither the name of the dreamlu.net developer nor the names of its + * contributors may be used to endorse or promote products derived from + * this software without specific prior written permission. + * Author: Chill 庄骞 (smallchill@163.com) + */ +package com.logpm.distribution.vo; + +import com.logpm.distribution.entity.DistributionDeliveryListEntity; +import io.swagger.annotations.ApiModelProperty; +import org.springblade.core.tool.node.INode; +import lombok.Data; +import lombok.EqualsAndHashCode; + +/** + * 配送管理 视图实体类 + * + * @author lmy + * @since 2023-06-16 + */ +@Data +@EqualsAndHashCode(callSuper = true) +public class DistributionDeliveryListVO extends DistributionDeliveryListEntity { + private static final long serialVersionUID = 1L; + /** + * 预留4 + */ + @ApiModelProperty(value = "预留4") + private String reserve4; + + +} diff --git a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/DistributionSigndetailVO.java b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/DistributionSigndetailVO.java index 8aa53da9b..d78f9191d 100644 --- a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/DistributionSigndetailVO.java +++ b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/DistributionSigndetailVO.java @@ -67,14 +67,14 @@ public class DistributionSigndetailVO extends DistributionSigndetailEntity { * 签收时间 */ @ApiModelProperty(value = "签收时间") - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8") - private Date signingTime; +// @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8") + private String signingTime; /** * 司机签收时间 */ @ApiModelProperty(value = "司机签收时间") - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8") - private Date sjsigningTime; +// @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8") + private String sjsigningTime; /** * 包条信息 diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/controller/DistributionDeliveryListController.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/controller/DistributionDeliveryListController.java new file mode 100644 index 000000000..4d9839be4 --- /dev/null +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/controller/DistributionDeliveryListController.java @@ -0,0 +1,154 @@ +/* + * Copyright (c) 2018-2028, Chill Zhuang All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * + * Redistributions of source code must retain the above copyright notice, + * this list of conditions and the following disclaimer. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * Neither the name of the dreamlu.net developer nor the names of its + * contributors may be used to endorse or promote products derived from + * this software without specific prior written permission. + * Author: Chill 庄骞 (smallchill@163.com) + */ +package com.logpm.distribution.controller; + +import cn.hutool.core.util.BooleanUtil; +import com.logpm.distribution.dto.DistributionDeliveryListDTO; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import io.swagger.annotations.ApiParam; +import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport; +import lombok.AllArgsConstructor; +import javax.validation.Valid; + +import org.springblade.core.secure.BladeUser; +import org.springblade.core.mp.support.Condition; +import org.springblade.core.mp.support.Query; +import org.springblade.core.tool.api.R; +import org.springblade.core.tool.utils.Func; +import org.springframework.beans.BeanUtils; +import org.springframework.web.bind.annotation.*; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.logpm.distribution.entity.DistributionDeliveryListEntity; +import com.logpm.distribution.vo.DistributionDeliveryListVO; +import com.logpm.distribution.excel.DistributionDeliveryListExcel; +import com.logpm.distribution.service.IDistributionDeliveryListService; +import org.springblade.core.boot.ctrl.BladeController; +import org.springblade.core.tool.utils.DateUtil; +import org.springblade.core.excel.util.ExcelUtil; +import org.springblade.core.tool.constant.BladeConstant; +import springfox.documentation.annotations.ApiIgnore; +import java.util.Map; +import java.util.List; +import javax.servlet.http.HttpServletResponse; + +/** + * 配送管理 控制器 + * + * @author lmy + * @since 2023-06-16 + */ +@RestController +@AllArgsConstructor +@RequestMapping("/deliveryList") +@Api(value = "配送管理", tags = "配送管理接口") +public class DistributionDeliveryListController extends BladeController { + + private final IDistributionDeliveryListService distributionDeliveryListService; + + /** + * 配送管理 详情 + */ + @GetMapping("/detail") + @ApiOperationSupport(order = 1) + @ApiOperation(value = "详情", notes = "传入distributionDeliveryList") + public R detail(DistributionDeliveryListDTO distributionDeliveryList) { + DistributionDeliveryListEntity detail = distributionDeliveryListService.getOne(Condition.getQueryWrapper(distributionDeliveryList)); + DistributionDeliveryListVO distributionDeliveryListVO = distributionDeliveryListService.getdetailVO(detail); + return R.data(distributionDeliveryListVO); + } + /** + * 配送管理 分页 + */ + @GetMapping("/list") + @ApiOperationSupport(order = 2) + @ApiOperation(value = "分页", notes = "传入distributionDeliveryList") + public R> list(@ApiIgnore @RequestParam Map distributionDeliveryList, Query query) { + IPage pages = distributionDeliveryListService.page(Condition.getPage(query), Condition.getQueryWrapper(distributionDeliveryList, DistributionDeliveryListEntity.class)); + return R.data(pages); + } + + /** + * 配送管理 自定义分页 + */ + @GetMapping("/page") + @ApiOperationSupport(order = 3) + @ApiOperation(value = "分页", notes = "传入distributionDeliveryList") + public R> page(DistributionDeliveryListVO distributionDeliveryList, Query query) { + IPage pages = distributionDeliveryListService.selectDistributionDeliveryListPage(Condition.getPage(query), distributionDeliveryList); + return R.data(pages); + } + + /** + * 配送管理 新增 + */ + @PostMapping("/save") + @ApiOperationSupport(order = 4) + @ApiOperation(value = "新增", notes = "传入distributionDeliveryList") + public R save(@Valid @RequestBody DistributionDeliveryListEntity distributionDeliveryList) { + return R.status(distributionDeliveryListService.save(distributionDeliveryList)); + } + + /** + * 配送管理 修改 + */ + @PostMapping("/update") + @ApiOperationSupport(order = 5) + @ApiOperation(value = "修改", notes = "传入distributionDeliveryList") + public R update(@Valid @RequestBody DistributionDeliveryListEntity distributionDeliveryList) { + return R.status(distributionDeliveryListService.updateById(distributionDeliveryList)); + } + + /** + * 配送管理 新增或修改 + */ + @PostMapping("/submit") + @ApiOperationSupport(order = 6) + @ApiOperation(value = "新增或修改", notes = "传入distributionDeliveryList") + public R submit(@Valid @RequestBody DistributionDeliveryListEntity distributionDeliveryList) { + return R.status(distributionDeliveryListService.saveOrUpdate(distributionDeliveryList)); + } + + /** + * 配送管理 删除 + */ + @PostMapping("/remove") + @ApiOperationSupport(order = 7) + @ApiOperation(value = "逻辑删除", notes = "传入ids") + public R remove(@ApiParam(value = "主键集合", required = true) @RequestParam String ids) { + return R.status(distributionDeliveryListService.deleteLogic(Func.toLongList(ids))); + } + + + /** + * 导出数据 + */ + @GetMapping("/export-distributionDeliveryList") + @ApiOperationSupport(order = 9) + @ApiOperation(value = "导出数据", notes = "传入distributionDeliveryList") + public void exportDistributionDeliveryList(@ApiIgnore @RequestParam Map distributionDeliveryList, BladeUser bladeUser, HttpServletResponse response) { + QueryWrapper queryWrapper = Condition.getQueryWrapper(distributionDeliveryList, DistributionDeliveryListEntity.class); + //if (!AuthUtil.isAdministrator()) { + // queryWrapper.lambda().eq(DistributionDeliveryList::getTenantId, bladeUser.getTenantId()); + //} + queryWrapper.lambda().eq(DistributionDeliveryListEntity::getIsDeleted, BladeConstant.DB_NOT_DELETED); + List list = distributionDeliveryListService.exportDistributionDeliveryList(queryWrapper); + ExcelUtil.export(response, "配送管理数据" + DateUtil.time(), "配送管理数据表", list, DistributionDeliveryListExcel.class); + } + +} diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/controller/DistributionSigndetailController.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/controller/DistributionSigndetailController.java index b616fbd38..ddc569923 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/controller/DistributionSigndetailController.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/controller/DistributionSigndetailController.java @@ -53,6 +53,7 @@ import org.springblade.core.tool.constant.BladeConstant; import com.baomidou.mybatisplus.core.metadata.IPage; import springfox.documentation.annotations.ApiIgnore; +import java.text.DateFormat; import java.text.SimpleDateFormat; import java.util.Date; import java.util.Map; @@ -115,6 +116,7 @@ public class DistributionSigndetailController extends BladeController { @ApiOperationSupport(order = 3) @ApiOperation(value = "分页", notes = "传入distributionSigndetail") public R> page(DistributionSigndetailDTO distributionSigndetail, Query query) { + log.info("接收>>>>>>>>>>>>>>>{}",distributionSigndetail.getWarehousingTime()); //获取当前登录用户 BladeUser user = AuthUtil.getUser(); IPage pages = distributionSigndetailService.selectDistributionSigndetailPage(Condition.getPage(query), distributionSigndetail); 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 1feffee8d..dfaa5d0b5 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 @@ -102,6 +102,7 @@ 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/dto/DistributionDeliveryListDTO.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/dto/DistributionDeliveryListDTO.java new file mode 100644 index 000000000..66a5ae247 --- /dev/null +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/dto/DistributionDeliveryListDTO.java @@ -0,0 +1,34 @@ +/* + * Copyright (c) 2018-2028, Chill Zhuang All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * + * Redistributions of source code must retain the above copyright notice, + * this list of conditions and the following disclaimer. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * Neither the name of the dreamlu.net developer nor the names of its + * contributors may be used to endorse or promote products derived from + * this software without specific prior written permission. + * Author: Chill 庄骞 (smallchill@163.com) + */ +package com.logpm.distribution.dto; + +import com.logpm.distribution.entity.DistributionDeliveryListEntity; +import lombok.Data; +import lombok.EqualsAndHashCode; + +/** + * 配送管理 数据传输对象实体类 + * + * @author lmy + * @since 2023-06-16 + */ +@Data +@EqualsAndHashCode(callSuper = true) +public class DistributionDeliveryListDTO extends DistributionDeliveryListEntity { + private static final long serialVersionUID = 1L; + +} diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/excel/DistributionDeliveryListExcel.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/excel/DistributionDeliveryListExcel.java new file mode 100644 index 000000000..7746ab581 --- /dev/null +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/excel/DistributionDeliveryListExcel.java @@ -0,0 +1,184 @@ +/* + * Copyright (c) 2018-2028, Chill Zhuang All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * + * Redistributions of source code must retain the above copyright notice, + * this list of conditions and the following disclaimer. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * Neither the name of the dreamlu.net developer nor the names of its + * contributors may be used to endorse or promote products derived from + * this software without specific prior written permission. + * Author: Chill 庄骞 (smallchill@163.com) + */ +package com.logpm.distribution.excel; + + +import lombok.Data; + +import java.util.Date; +import java.math.BigDecimal; +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.write.style.ColumnWidth; +import com.alibaba.excel.annotation.write.style.ContentRowHeight; +import com.alibaba.excel.annotation.write.style.HeadRowHeight; +import java.io.Serializable; + + +/** + * 配送管理 Excel实体类 + * + * @author lmy + * @since 2023-06-16 + */ +@Data +@ColumnWidth(25) +@HeadRowHeight(20) +@ContentRowHeight(18) +public class DistributionDeliveryListExcel implements Serializable { + + private static final long serialVersionUID = 1L; + + /** + * 租户号 + */ + @ColumnWidth(20) + @ExcelProperty("租户号") + private String tenantId; + /** + * 是否已删除 + */ + @ColumnWidth(20) + @ExcelProperty("是否已删除") + private Integer isDeleted; + /** + * 预留1 + */ + @ColumnWidth(20) + @ExcelProperty("预留1") + private String reserve1; + /** + * 预留2 + */ + @ColumnWidth(20) + @ExcelProperty("预留2") + private String reserve2; + /** + * 预留3 + */ + @ColumnWidth(20) + @ExcelProperty("预留3") + private String reserve3; + /** + * 预留4 + */ + @ColumnWidth(20) + @ExcelProperty("预留4") + private String reserve4; + /** + * 预留5 + */ + @ColumnWidth(20) + @ExcelProperty("预留5") + private String reserve5; + /** + * 车次 + */ + @ColumnWidth(20) + @ExcelProperty("车次") + private String trainNumber; + /** + * 仓库 + */ + @ColumnWidth(20) + @ExcelProperty("仓库") + private String warehouse; + /** + * 配送类型;1-自主配送,2-三方配送 + */ + @ColumnWidth(20) + @ExcelProperty("配送类型;1-自主配送,2-三方配送") + private String type; + /** + * 配送种类;1-市配,2-商配 + */ + @ColumnWidth(20) + @ExcelProperty("配送种类;1-市配,2-商配") + private String kind; + /** + * 配送车辆 + */ + @ColumnWidth(20) + @ExcelProperty("配送车辆") + private String vehicle; + /** + * 配送司机 + */ + @ColumnWidth(20) + @ExcelProperty("配送司机") + private String driver; + /** + * 配送公司;1-货拉拉,2-京东 + */ + @ColumnWidth(20) + @ExcelProperty("配送公司;1-货拉拉,2-京东") + private String distributionCompany; + /** + * 配送状态;1-配送中,2-已完成 + */ + @ColumnWidth(20) + @ExcelProperty("配送状态;1-配送中,2-已完成") + private String state; + /** + * 配送客户数 + */ + @ColumnWidth(20) + @ExcelProperty("配送客户数") + private Integer customersNumber; + /** + * 配送价格 + */ + @ColumnWidth(20) + @ExcelProperty("配送价格") + private BigDecimal price; + /** + * 增值服务表id + */ + @ColumnWidth(20) + @ExcelProperty("增值服务表id") + private Integer addedServicesId; + /** + * 订单总数 + */ + @ColumnWidth(20) + @ExcelProperty("订单总数") + private Integer orderNumber; + /** + * 配送件数 + */ + @ColumnWidth(20) + @ExcelProperty("配送件数") + private Integer deliveryNumber; + /** + * 扫描件数 + */ + @ColumnWidth(20) + @ExcelProperty("扫描件数") + private Integer scannedNumber; + /** + * 装卸班组 + */ + @ColumnWidth(20) + @ExcelProperty("装卸班组") + private String loadingTeam; + /** + * 预约表id + */ + @ColumnWidth(20) + @ExcelProperty("预约表id") + private String reservationId; + +} diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/feign/DistributionDeliveryListClient.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/feign/DistributionDeliveryListClient.java new file mode 100644 index 000000000..845459a04 --- /dev/null +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/feign/DistributionDeliveryListClient.java @@ -0,0 +1,53 @@ +/* + * Copyright (c) 2018-2028, Chill Zhuang All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * + * Redistributions of source code must retain the above copyright notice, + * this list of conditions and the following disclaimer. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * Neither the name of the dreamlu.net developer nor the names of its + * contributors may be used to endorse or promote products derived from + * this software without specific prior written permission. + * Author: Chill 庄骞 (smallchill@163.com) + */ +package com.logpm.distribution.feign; + +import com.baomidou.mybatisplus.core.metadata.IPage; +import lombok.AllArgsConstructor; +import org.springblade.core.mp.support.BladePage; +import org.springblade.core.mp.support.Condition; +import org.springblade.core.mp.support.Query; +import com.logpm.distribution.entity.DistributionDeliveryListEntity; +import com.logpm.distribution.service.IDistributionDeliveryListService; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RestController; +import springfox.documentation.annotations.ApiIgnore; + +/** + * 配送管理 Feign实现类 + * + * @author lmy + * @since 2023-06-16 + */ +@ApiIgnore() +@RestController +@AllArgsConstructor +public class DistributionDeliveryListClient implements IDistributionDeliveryListClient { + + private final IDistributionDeliveryListService distributionDeliveryListService; + + @Override + @GetMapping(TOP) + public BladePage top(Integer current, Integer size) { + Query query = new Query(); + query.setCurrent(current); + query.setSize(size); + IPage page = distributionDeliveryListService.page(Condition.getPage(query)); + return BladePage.of(page); + } + +} diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionDeliveryListMapper.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionDeliveryListMapper.java new file mode 100644 index 000000000..297b21720 --- /dev/null +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionDeliveryListMapper.java @@ -0,0 +1,54 @@ +/* + * Copyright (c) 2018-2028, Chill Zhuang All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * + * Redistributions of source code must retain the above copyright notice, + * this list of conditions and the following disclaimer. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * Neither the name of the dreamlu.net developer nor the names of its + * contributors may be used to endorse or promote products derived from + * this software without specific prior written permission. + * Author: Chill 庄骞 (smallchill@163.com) + */ +package com.logpm.distribution.mapper; + +import com.logpm.distribution.entity.DistributionDeliveryListEntity; +import com.logpm.distribution.vo.DistributionDeliveryListVO; +import com.logpm.distribution.excel.DistributionDeliveryListExcel; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.conditions.Wrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import org.apache.ibatis.annotations.Param; +import java.util.List; + +/** + * 配送管理 Mapper 接口 + * + * @author lmy + * @since 2023-06-16 + */ +public interface DistributionDeliveryListMapper extends BaseMapper { + + /** + * 自定义分页 + * + * @param page + * @param distributionDeliveryList + * @return + */ + List selectDistributionDeliveryListPage(IPage page, DistributionDeliveryListVO distributionDeliveryList); + + + /** + * 获取导出数据 + * + * @param queryWrapper + * @return + */ + List exportDistributionDeliveryList(@Param("ew") Wrapper queryWrapper); + +} diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionDeliveryListMapper.xml b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionDeliveryListMapper.xml new file mode 100644 index 000000000..aea9b9e18 --- /dev/null +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionDeliveryListMapper.xml @@ -0,0 +1,49 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionSigndetailMapper.xml b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionSigndetailMapper.xml index 1574c574b..b7c86aba3 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionSigndetailMapper.xml +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionSigndetailMapper.xml @@ -101,7 +101,22 @@ and ldsd.consignee_phone like concat('%',#{param.consigneePhone},'%') - and ldsd.warehousing_time = #{param.warehousingTime} + and date_format(ldsd.warehousing_time,'%y%m%d%') = date_format(#{param.warehousingTime},'%y%m%d%') + + + and date_format(ldsf.signing_time,'%y%m%d%') = date_format(#{param.signingTime},'%y%m%d%') + + + and date_format(ldsf.sjsigning_time,'%y%m%d%') = date_format(#{param.sjsigningTime},'%y%m%d%') + + + and date_format(ldsd.lead_time,'%y%m%d%') = date_format(#{param.leadTime},'%y%m%d%') + + + and date_format(ldsd.sjsigning_time,'%y%m%d%') = date_format(#{param.sjsigningTime},'%y%m%d%') + + + and date_format(ldsd.create_time,'%y%m%d%') = date_format(#{param.createTime_query},'%y%m%d%') order by ldsd.create_time desc diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/IDistributionDeliveryListService.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/IDistributionDeliveryListService.java new file mode 100644 index 000000000..36228f254 --- /dev/null +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/IDistributionDeliveryListService.java @@ -0,0 +1,58 @@ +/* + * Copyright (c) 2018-2028, Chill Zhuang All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * + * Redistributions of source code must retain the above copyright notice, + * this list of conditions and the following disclaimer. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * Neither the name of the dreamlu.net developer nor the names of its + * contributors may be used to endorse or promote products derived from + * this software without specific prior written permission. + * Author: Chill 庄骞 (smallchill@163.com) + */ +package com.logpm.distribution.service; + +import com.baomidou.mybatisplus.core.conditions.Wrapper; +import com.logpm.distribution.entity.DistributionDeliveryListEntity; +import com.logpm.distribution.vo.DistributionDeliveryListVO; +import com.logpm.distribution.excel.DistributionDeliveryListExcel; +import com.baomidou.mybatisplus.core.metadata.IPage; +import org.springblade.core.mp.base.BaseService; +import java.util.List; + +/** + * 配送管理 服务类 + * + * @author lmy + * @since 2023-06-16 + */ +public interface IDistributionDeliveryListService extends BaseService { + /** + * 自定义分页 + * + * @param page + * @param distributionDeliveryList + * @return + */ + IPage selectDistributionDeliveryListPage(IPage page, DistributionDeliveryListVO distributionDeliveryList); + + + /** + * 导出数据 + * + * @param queryWrapper + * @return + */ + List exportDistributionDeliveryList(Wrapper queryWrapper); + /** + * 获取其他表信息 + * + * @param detail + * @return + */ + DistributionDeliveryListVO getdetailVO(DistributionDeliveryListEntity detail); +} diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionDeliveryListServiceImpl.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionDeliveryListServiceImpl.java new file mode 100644 index 000000000..ef93cc809 --- /dev/null +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionDeliveryListServiceImpl.java @@ -0,0 +1,64 @@ +/* + * Copyright (c) 2018-2028, Chill Zhuang All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * + * Redistributions of source code must retain the above copyright notice, + * this list of conditions and the following disclaimer. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * Neither the name of the dreamlu.net developer nor the names of its + * contributors may be used to endorse or promote products derived from + * this software without specific prior written permission. + * Author: Chill 庄骞 (smallchill@163.com) + */ +package com.logpm.distribution.service.impl; + +import com.logpm.distribution.entity.DistributionDeliveryListEntity; +import com.logpm.distribution.vo.DistributionDeliveryListVO; +import com.logpm.distribution.excel.DistributionDeliveryListExcel; +import com.logpm.distribution.mapper.DistributionDeliveryListMapper; +import com.logpm.distribution.service.IDistributionDeliveryListService; +import org.springframework.beans.BeanUtils; +import org.springframework.stereotype.Service; +import com.baomidou.mybatisplus.core.conditions.Wrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import org.springblade.core.mp.base.BaseServiceImpl; +import java.util.List; + +/** + * 配送管理 服务实现类 + * + * @author lmy + * @since 2023-06-16 + */ +@Service +public class DistributionDeliveryListServiceImpl extends BaseServiceImpl implements IDistributionDeliveryListService { + + @Override + public IPage selectDistributionDeliveryListPage(IPage page, DistributionDeliveryListVO distributionDeliveryList) { + return page.setRecords(baseMapper.selectDistributionDeliveryListPage(page, distributionDeliveryList)); + } + + + @Override + public List exportDistributionDeliveryList(Wrapper queryWrapper) { + List distributionDeliveryListList = baseMapper.exportDistributionDeliveryList(queryWrapper); + //distributionDeliveryListList.forEach(distributionDeliveryList -> { + // distributionDeliveryList.setTypeName(DictCache.getValue(DictEnum.YES_NO, DistributionDeliveryList.getType())); + //}); + return distributionDeliveryListList; + } + + @Override + public DistributionDeliveryListVO getdetailVO(DistributionDeliveryListEntity detail) { + DistributionDeliveryListVO distributionDeliveryListVO = new DistributionDeliveryListVO(); + //转移数据到VO上 + BeanUtils.copyProperties(detail,distributionDeliveryListVO); + + return null; + } + +} diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionSigndetailServiceImpl.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionSigndetailServiceImpl.java index ffb83f9af..d9c80babb 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionSigndetailServiceImpl.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionSigndetailServiceImpl.java @@ -29,6 +29,8 @@ import org.springframework.stereotype.Service; import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import org.springblade.core.mp.base.BaseServiceImpl; + +import java.text.SimpleDateFormat; import java.util.List; /** @@ -43,6 +45,11 @@ public class DistributionSigndetailServiceImpl extends BaseServiceImpl selectDistributionSigndetailPage(IPage page, DistributionSigndetailDTO distributionSigndetail) { + //转换创建时间 + if (null != distributionSigndetail.getCreateTime()){ + SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd"); + distributionSigndetail.setCreateTime_query(sdf.format(distributionSigndetail.getCreateTime())); + } return page.setRecords(baseMapper.selectDistributionSigndetailPage(page, distributionSigndetail)); }