租赁管理补充仓库和货主字段

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;
 

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;
 

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;
 

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;
 

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>