From 34e2c94d79d59f647b1e44d4a05fa40acdc85824 Mon Sep 17 00:00:00 2001 From: siontion Date: Mon, 15 Jul 2024 13:32:33 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90=E5=87=BA=E5=85=A5=E5=BA=93=E3=80=91?= =?UTF-8?q?=E5=8D=95=E6=8D=AE=E6=97=A5=E6=9C=9F=E6=9F=A5=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../biz/controller/admin/storage/vo/StoragePageReqVO.java | 4 ++-- .../yunxi/mes/module/biz/dal/mysql/storage/StorageMapper.java | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/mes-module-majoys/mes-module-majoys-biz/src/main/java/com/chanko/yunxi/mes/module/biz/controller/admin/storage/vo/StoragePageReqVO.java b/mes-module-majoys/mes-module-majoys-biz/src/main/java/com/chanko/yunxi/mes/module/biz/controller/admin/storage/vo/StoragePageReqVO.java index 5b2cb4b0..25bd2856 100644 --- a/mes-module-majoys/mes-module-majoys-biz/src/main/java/com/chanko/yunxi/mes/module/biz/controller/admin/storage/vo/StoragePageReqVO.java +++ b/mes-module-majoys/mes-module-majoys-biz/src/main/java/com/chanko/yunxi/mes/module/biz/controller/admin/storage/vo/StoragePageReqVO.java @@ -86,9 +86,9 @@ public class StoragePageReqVO extends PageParam { @Schema(description = "生产订单Code") private String projectOrderCode; - private String sDate; + private String minCreateTime; - private String eDate; + private String maxCreateTime; } diff --git a/mes-module-majoys/mes-module-majoys-biz/src/main/java/com/chanko/yunxi/mes/module/biz/dal/mysql/storage/StorageMapper.java b/mes-module-majoys/mes-module-majoys-biz/src/main/java/com/chanko/yunxi/mes/module/biz/dal/mysql/storage/StorageMapper.java index 58cfbd1a..2cd84d0b 100644 --- a/mes-module-majoys/mes-module-majoys-biz/src/main/java/com/chanko/yunxi/mes/module/biz/dal/mysql/storage/StorageMapper.java +++ b/mes-module-majoys/mes-module-majoys-biz/src/main/java/com/chanko/yunxi/mes/module/biz/dal/mysql/storage/StorageMapper.java @@ -38,7 +38,7 @@ public interface StorageMapper extends BaseMapperX { .like(!StringUtils.isEmpty(reqVO.getMatName()), "f.name", reqVO.getMatName()) .like(!StringUtils.isEmpty(reqVO.getStockNo()),StorageDO::getStockNo, reqVO.getStockNo()) .like(!StringUtils.isEmpty(reqVO.getHeaderNo()),StorageDO::getHeaderNo, reqVO.getHeaderNo()) - .between(!StringUtils.isEmpty(reqVO.getSDate()) && !StringUtils.isEmpty(reqVO.getEDate()),StorageDO::getCreateTime,reqVO.getSDate(),reqVO.getEDate()) + .between(!StringUtils.isEmpty(reqVO.getMinCreateTime()) && !StringUtils.isEmpty(reqVO.getMaxCreateTime()),StorageDO::getCreateTime,reqVO.getMinCreateTime(),reqVO.getMaxCreateTime()) .eq(reqVO.getStockType() != null,StorageDO::getStockType, reqVO.getStockType()) .eq(reqVO.getStockInType() != null,StorageDO::getStockInType, reqVO.getStockInType()) .eq(reqVO.getWhId() != null,StorageDO::getWhId, reqVO.getWhId())