From eb3b43582c7584284ede6204ade2b4455004eab9 Mon Sep 17 00:00:00 2001 From: caoyizhong <1270296080@qq.com> Date: Mon, 6 Nov 2023 21:15:19 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9pc=20=E5=A4=87=E8=B4=A7?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../DistributionSignforController.java | 10 +---- .../excel/DistributionSignforExcel.java | 43 +------------------ .../mapper/DistributionSignforMapper.java | 2 +- .../mapper/DistributionSignforMapper.xml | 2 +- .../mapper/DistrilbutionBillStockMapper.xml | 4 +- .../service/IDistributionSignforService.java | 6 +-- .../impl/DistributionSignforServiceImpl.java | 40 +++++++++++++---- .../impl/DistributionStockServiceImpl.java | 17 +++++++- 8 files changed, 56 insertions(+), 68 deletions(-) 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 33ca15b5d..e75a8034a 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 @@ -21,7 +21,6 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport; import com.logpm.distribution.dto.DistributionAddvalueDTO; -import com.logpm.distribution.dto.DistributionReservationStocklistDTO; import com.logpm.distribution.dto.DistributionSignforDTO; import com.logpm.distribution.entity.DistributionSignPrintEntity; import com.logpm.distribution.entity.DistributionSignforEntity; @@ -42,7 +41,6 @@ import org.springblade.core.mp.support.Query; import org.springblade.core.secure.BladeUser; import org.springblade.core.secure.utils.AuthUtil; import org.springblade.core.tool.api.R; -import org.springblade.core.tool.constant.BladeConstant; import org.springblade.core.tool.utils.DateUtil; import org.springblade.core.tool.utils.Func; import org.springblade.core.tool.utils.ObjectUtil; @@ -292,12 +290,8 @@ public class DistributionSignforController extends BladeController { @ApiOperationSupport(order = 9) @ApiOperation(value = "导出数据", notes = "传入distributionSignfor") public void exportDistributionSignfor(@ApiIgnore @RequestParam Map distributionSignfor, BladeUser bladeUser, HttpServletResponse response) { - QueryWrapper queryWrapper = Condition.getQueryWrapper(distributionSignfor, DistributionSignforEntity.class); - //if (!AuthUtil.isAdministrator()) { - // queryWrapper.lambda().eq(DistributionSignfor::getTenantId, bladeUser.getTenantId()); - //} - queryWrapper.lambda().eq(DistributionSignforEntity::getIsDeleted, BladeConstant.DB_NOT_DELETED); - List list = distributionSignforService.exportDistributionSignfor(queryWrapper); + + List list = distributionSignforService.exportDistributionSignfor(distributionSignfor); ExcelUtil.export(response, "签收管理数据" + DateUtil.time(), "签收管理数据表", list, DistributionSignforExcel.class); } diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/excel/DistributionSignforExcel.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/excel/DistributionSignforExcel.java index d42ecf506..3601d99ce 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/excel/DistributionSignforExcel.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/excel/DistributionSignforExcel.java @@ -41,48 +41,7 @@ public class DistributionSignforExcel 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; + /** * 订单自编号;订单关联id */ 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 2bff9844d..d9de9d051 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 @@ -57,7 +57,7 @@ public interface DistributionSignforMapper extends BaseMapper exportDistributionSignfor(@Param("ew") Wrapper queryWrapper); + List exportDistributionSignfor(@Param("ew") Wrapper queryWrapper); /** * 订单总数 * 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 896b546f1..c694c6f13 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 @@ -376,7 +376,7 @@ - SELECT * FROM logpm_distribution_signfor ${ew.customSqlSegment}