From 41282b37ba10cee2925f00723038eb351880b627 Mon Sep 17 00:00:00 2001 From: chuzhichao Date: Fri, 5 May 2023 14:31:09 +0800 Subject: [PATCH] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E5=88=9B=E5=BB=BA=E5=87=BA?= =?UTF-8?q?=E5=85=A5=E5=BA=93=E5=8D=95=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../wms/mapper/CustomerTransactionMapper.java | 2 -- .../wms/mapper/SupplierTransactionMapper.java | 2 -- .../service/CustomerTransactionService.java | 20 ++++++++++++++++++- .../service/SupplierTransactionService.java | 19 +++++++++++++++++- .../mapper/CustomerTransactionMapper.xml | 17 ---------------- .../mapper/SupplierTransactionMapper.xml | 18 +---------------- 6 files changed, 38 insertions(+), 40 deletions(-) diff --git a/wms/src/main/java/com/cyl/wms/mapper/CustomerTransactionMapper.java b/wms/src/main/java/com/cyl/wms/mapper/CustomerTransactionMapper.java index f4659c0..b96b03b 100644 --- a/wms/src/main/java/com/cyl/wms/mapper/CustomerTransactionMapper.java +++ b/wms/src/main/java/com/cyl/wms/mapper/CustomerTransactionMapper.java @@ -26,6 +26,4 @@ public interface CustomerTransactionMapper extends BaseMapper selectList(CustomerTransactionQuery customerTransactionQuery); } diff --git a/wms/src/main/java/com/cyl/wms/mapper/SupplierTransactionMapper.java b/wms/src/main/java/com/cyl/wms/mapper/SupplierTransactionMapper.java index 03c50ae..629097a 100644 --- a/wms/src/main/java/com/cyl/wms/mapper/SupplierTransactionMapper.java +++ b/wms/src/main/java/com/cyl/wms/mapper/SupplierTransactionMapper.java @@ -26,6 +26,4 @@ public interface SupplierTransactionMapper extends BaseMapper selectList(SupplierTransactionQuery supplierTransactionQuery); } diff --git a/wms/src/main/java/com/cyl/wms/service/CustomerTransactionService.java b/wms/src/main/java/com/cyl/wms/service/CustomerTransactionService.java index 07b9176..594d9bc 100644 --- a/wms/src/main/java/com/cyl/wms/service/CustomerTransactionService.java +++ b/wms/src/main/java/com/cyl/wms/service/CustomerTransactionService.java @@ -5,10 +5,12 @@ import java.time.LocalDateTime; import java.util.Arrays; import java.util.List; import java.time.LocalDateTime; +import java.util.Optional; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.cyl.wms.domain.Customer; +import com.cyl.wms.domain.SupplierTransaction; import com.github.pagehelper.PageHelper; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.data.domain.Pageable; @@ -53,7 +55,23 @@ public class CustomerTransactionService { if (page != null) { PageHelper.startPage(page.getPageNumber() + 1, page.getPageSize()); } - return customerTransactionMapper.selectList(query); + LambdaQueryWrapper qw = new LambdaQueryWrapper<>(); + if (!StringUtils.isEmpty(query.getCustomerId())){ + qw.eq(CustomerTransaction::getCustomerId, query.getCustomerId()); + } + if (!StringUtils.isEmpty(query.getTransactionCode())){ + qw.eq(CustomerTransaction::getTransactionCode, query.getTransactionCode()); + } + if (!StringUtils.isEmpty(query.getTransactionType())){ + qw.eq(CustomerTransaction::getTransactionType, query.getTransactionType()); + } + Optional.ofNullable(query.getStartTime()).ifPresent( + startTime -> qw.ge(CustomerTransaction::getCreateTime, query.getStartTime()) + ); + Optional.ofNullable(query.getEndTime()).ifPresent( + startTime -> qw.le(CustomerTransaction::getCreateTime, query.getEndTime()) + ); + return customerTransactionMapper.selectList(qw); } /** diff --git a/wms/src/main/java/com/cyl/wms/service/SupplierTransactionService.java b/wms/src/main/java/com/cyl/wms/service/SupplierTransactionService.java index ee49115..ccf5d22 100644 --- a/wms/src/main/java/com/cyl/wms/service/SupplierTransactionService.java +++ b/wms/src/main/java/com/cyl/wms/service/SupplierTransactionService.java @@ -5,6 +5,7 @@ import java.time.LocalDateTime; import java.util.Arrays; import java.util.List; import java.time.LocalDateTime; +import java.util.Optional; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; @@ -53,7 +54,23 @@ public class SupplierTransactionService { if (page != null) { PageHelper.startPage(page.getPageNumber() + 1, page.getPageSize()); } - return supplierTransactionMapper.selectList(query); + LambdaQueryWrapper qw = new LambdaQueryWrapper<>(); + if (!StringUtils.isEmpty(query.getSupplierId())){ + qw.eq(SupplierTransaction::getSupplierId, query.getSupplierId()); + } + if (!StringUtils.isEmpty(query.getTransactionCode())){ + qw.eq(SupplierTransaction::getTransactionCode, query.getTransactionCode()); + } + if (!StringUtils.isEmpty(query.getTransactionType())){ + qw.eq(SupplierTransaction::getTransactionType, query.getTransactionType()); + } + Optional.ofNullable(query.getStartTime()).ifPresent( + startTime -> qw.ge(SupplierTransaction::getCreateTime, query.getStartTime()) + ); + Optional.ofNullable(query.getEndTime()).ifPresent( + startTime -> qw.le(SupplierTransaction::getCreateTime, query.getEndTime()) + ); + return supplierTransactionMapper.selectList(qw); } /** diff --git a/wms/src/main/resources/mapper/CustomerTransactionMapper.xml b/wms/src/main/resources/mapper/CustomerTransactionMapper.xml index d117402..aa509f7 100644 --- a/wms/src/main/resources/mapper/CustomerTransactionMapper.xml +++ b/wms/src/main/resources/mapper/CustomerTransactionMapper.xml @@ -36,23 +36,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - update wms_customer_transaction set del_flag=1 diff --git a/wms/src/main/resources/mapper/SupplierTransactionMapper.xml b/wms/src/main/resources/mapper/SupplierTransactionMapper.xml index 01bae2d..01c86f2 100644 --- a/wms/src/main/resources/mapper/SupplierTransactionMapper.xml +++ b/wms/src/main/resources/mapper/SupplierTransactionMapper.xml @@ -36,23 +36,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - + update wms_supplier_transaction set del_flag=1