From b72134a936dfd17f4fcbc033d3e9a911eda6e3d6 Mon Sep 17 00:00:00 2001
From: zhou-hongcheng <1064771933@qq.com>
Date: Wed, 28 Jan 2026 14:34:19 +0800
Subject: [PATCH] =?UTF-8?q?=E7=A7=9F=E8=B5=81=E7=AE=A1=E7=90=86=E8=A1=A5?=
 =?UTF-8?q?=E5=85=85=E4=BB=93=E5=BA=93=E5=92=8C=E8=B4=A7=E4=B8=BB=E5=AD=97?=
 =?UTF-8?q?=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/mhd/basic/domain/lease/entity/Lease.java    | 9 +++++++++
 .../mhd/basic/domain/lease/repository/po/LeasePO.java    | 9 +++++++++
 .../mhd/basic/domain/lease/repository/todo/LeaseDO.java  | 9 +++++++++
 .../com/mhd/basic/interfaces/dto/lease/LeaseDTO.java     | 9 +++++++++
 .../main/resources/mapper/basic/lease/LeaseMapper.xml    | 6 ++++++
 5 files changed, 42 insertions(+)

diff --git a/mhd-modules/mhd-system/src/main/java/com/mhd/basic/domain/lease/entity/Lease.java b/mhd-modules/mhd-system/src/main/java/com/mhd/basic/domain/lease/entity/Lease.java
index ccb4c61c9..a942af918 100644
--- a/mhd-modules/mhd-system/src/main/java/com/mhd/basic/domain/lease/entity/Lease.java
+++ b/mhd-modules/mhd-system/src/main/java/com/mhd/basic/domain/lease/entity/Lease.java
@@ -35,6 +35,15 @@ public class Lease extends BaseVOEntity{
     @Excel(name = "一级组织表ID")
     private Long topOrganizationId;
 
+    @ApiModelProperty("仓库ID")
+    private Long warehouseId;
+
+    @ApiModelProperty("仓库名字")
+    private String warehouseName;
+
+    @ApiModelProperty("货主id")
+    private Long shipperId;
+
     @ApiModelProperty("货主名称")
     private String cargoOwnerName;
 
diff --git a/mhd-modules/mhd-system/src/main/java/com/mhd/basic/domain/lease/repository/po/LeasePO.java b/mhd-modules/mhd-system/src/main/java/com/mhd/basic/domain/lease/repository/po/LeasePO.java
index 63b928e12..ce7433ac6 100644
--- a/mhd-modules/mhd-system/src/main/java/com/mhd/basic/domain/lease/repository/po/LeasePO.java
+++ b/mhd-modules/mhd-system/src/main/java/com/mhd/basic/domain/lease/repository/po/LeasePO.java
@@ -34,6 +34,15 @@ public class LeasePO extends BaseVOEntity{
     @Excel(name = "一级组织表ID")
     private Long topOrganizationId;
 
+    @ApiModelProperty("仓库ID")
+    private Long warehouseId;
+
+    @ApiModelProperty("仓库名字")
+    private String warehouseName;
+
+    @ApiModelProperty("货主id")
+    private Long shipperId;
+
     @ApiModelProperty("货主名称")
     private String cargoOwnerName;
 
diff --git a/mhd-modules/mhd-system/src/main/java/com/mhd/basic/domain/lease/repository/todo/LeaseDO.java b/mhd-modules/mhd-system/src/main/java/com/mhd/basic/domain/lease/repository/todo/LeaseDO.java
index 22755ecd4..216395a29 100644
--- a/mhd-modules/mhd-system/src/main/java/com/mhd/basic/domain/lease/repository/todo/LeaseDO.java
+++ b/mhd-modules/mhd-system/src/main/java/com/mhd/basic/domain/lease/repository/todo/LeaseDO.java
@@ -35,6 +35,15 @@ public class LeaseDO extends BaseVOEntity{
     @Excel(name = "一级组织表ID")
     private Long topOrganizationId;
 
+    @ApiModelProperty("仓库ID")
+    private Long warehouseId;
+
+    @ApiModelProperty("仓库名字")
+    private String warehouseName;
+
+    @ApiModelProperty("货主id")
+    private Long shipperId;
+
     @ApiModelProperty("货主名称")
     private String cargoOwnerName;
 
diff --git a/mhd-modules/mhd-system/src/main/java/com/mhd/basic/interfaces/dto/lease/LeaseDTO.java b/mhd-modules/mhd-system/src/main/java/com/mhd/basic/interfaces/dto/lease/LeaseDTO.java
index b41954c13..8424cd129 100644
--- a/mhd-modules/mhd-system/src/main/java/com/mhd/basic/interfaces/dto/lease/LeaseDTO.java
+++ b/mhd-modules/mhd-system/src/main/java/com/mhd/basic/interfaces/dto/lease/LeaseDTO.java
@@ -33,6 +33,15 @@ public class LeaseDTO extends BaseVOEntity{
     @Excel(name = "一级组织表ID")
     private Long topOrganizationId;
 
+    @ApiModelProperty("仓库ID")
+    private Long warehouseId;
+
+    @ApiModelProperty("仓库名字")
+    private String warehouseName;
+
+    @ApiModelProperty("货主id")
+    private Long shipperId;
+
     @ApiModelProperty("货主名称")
     private String cargoOwnerName;
 
diff --git a/mhd-modules/mhd-system/src/main/resources/mapper/basic/lease/LeaseMapper.xml b/mhd-modules/mhd-system/src/main/resources/mapper/basic/lease/LeaseMapper.xml
index 99ce74d42..745535951 100644
--- a/mhd-modules/mhd-system/src/main/resources/mapper/basic/lease/LeaseMapper.xml
+++ b/mhd-modules/mhd-system/src/main/resources/mapper/basic/lease/LeaseMapper.xml
@@ -33,6 +33,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             organization_id,
             organization_name,
             top_organization_id,
+            warehouse_id,
+            warehouse_name,
+            shipper_id,
             cargo_owner_name,
             lease_type,
             lease_area,
@@ -61,6 +64,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="organizationName != null  and organizationName != ''">
                 and organization_name like concat('%', #{organizationName}, '%')
             </if>
+            <if test="warehouseName != null  and warehouseName != ''">
+                and warehouse_name like concat('%', #{warehouseName}, '%')
+            </if>
             <if test="cargoOwnerName != null  and cargoOwnerName != ''">
                 and cargo_owner_name like concat('%', #{cargoOwnerName}, '%')
             </if>