From 3d4f37ce09b80f0e53d73046ea44ba9833fb20f2 Mon Sep 17 00:00:00 2001
From: wangpengfei <1928057482@qq.com>
Date: Wed, 30 Oct 2024 15:42:06 +0800
Subject: [PATCH] 10-30

---
 .../warehouse/biz/warehouseinfo/WarehouseInfoMapQuery.java | 2 ++
 .../warehouse/biz/warehouseinfo/WarehouseInfoService.java  | 7 +++++++
 2 files changed, 9 insertions(+)

diff --git a/src/main/java/com/yxt/warehouse/biz/warehouseinfo/WarehouseInfoMapQuery.java b/src/main/java/com/yxt/warehouse/biz/warehouseinfo/WarehouseInfoMapQuery.java
index 9a6cd10..e5d8f5c 100644
--- a/src/main/java/com/yxt/warehouse/biz/warehouseinfo/WarehouseInfoMapQuery.java
+++ b/src/main/java/com/yxt/warehouse/biz/warehouseinfo/WarehouseInfoMapQuery.java
@@ -19,5 +19,7 @@ public class WarehouseInfoMapQuery implements Query {
     private String warehouseName;
     private String address;
     private String warehouseCode;
+    private String belongingPlace;
+    private String endTime;
 
 }
diff --git a/src/main/java/com/yxt/warehouse/biz/warehouseinfo/WarehouseInfoService.java b/src/main/java/com/yxt/warehouse/biz/warehouseinfo/WarehouseInfoService.java
index 1ca0a88..050eea3 100644
--- a/src/main/java/com/yxt/warehouse/biz/warehouseinfo/WarehouseInfoService.java
+++ b/src/main/java/com/yxt/warehouse/biz/warehouseinfo/WarehouseInfoService.java
@@ -156,6 +156,13 @@ public class WarehouseInfoService extends MybatisBaseService<WarehouseInfoMapper
         if (org.apache.commons.lang3.StringUtils.isNotBlank(query.getWarehouseCode())) {
             qw.like("a.warehouseCode", query.getWarehouseCode());
         }
+        if (org.apache.commons.lang3.StringUtils.isNotBlank(query.getBelongingPlace())) {
+            qw.like("a.belongingPlace", query.getBelongingPlace());
+        }
+        if (org.apache.commons.lang3.StringUtils.isNotBlank(query.getEndTime())) {
+            qw.apply(StringUtils.isNotBlank(query.getEndTime()), "date_format (a.createTime,'%Y-%m-%d') <= date_format('" + query.getEndTime() + "','%Y-%m-%d')"
+            );
+        }
         if(query.getSids().size()!=0){
             qw.in("a.sid",query.getSids());
         }