仓库管理的查询的优化

src/main/java/com/boco/nbd/wios/manage/entity/bo/Warehouse.java

@@ -37,11 +37,11 @@ public class Warehouse extends CoreEntity {
 
     private Integer isEnabled;
 
-    private Integer superiorWarehouseId;
+    private String superiorWarehouseId;
 
     private String receivePeople;
 
-    private Integer receivePhone;
+    private String receivePhone;
 
     private String receiveAddress;
 
@@ -157,11 +157,11 @@ public class Warehouse extends CoreEntity {
         this.isEnabled = isEnabled;
     }
 
-    public Integer getSuperiorWarehouseId() {
+    public String getSuperiorWarehouseId() {
         return superiorWarehouseId;
     }
 
-    public void setSuperiorWarehouseId(Integer superiorWarehouseId) {
+    public void setSuperiorWarehouseId(String superiorWarehouseId) {
         this.superiorWarehouseId = superiorWarehouseId;
     }
 
@@ -173,11 +173,11 @@ public class Warehouse extends CoreEntity {
         this.receivePeople = receivePeople;
     }
 
-    public Integer getReceivePhone() {
+    public String getReceivePhone() {
         return receivePhone;
     }
 
-    public void setReceivePhone(Integer receivePhone) {
+    public void setReceivePhone(String receivePhone) {
         this.receivePhone = receivePhone;
     }
 

src/main/java/com/boco/nbd/wios/manage/entity/dto/WarehouseDTO.java

@@ -70,11 +70,11 @@ public class WarehouseDTO implements Serializable {
     @ApiModelProperty(value = "全路径名称")
     private String pathName;
     @ApiModelProperty(value = "上级仓库ID")
-    private Integer superiorWarehouseId;
+    private String superiorWarehouseId;
     @ApiModelProperty(value = "收件人")
     private String receivePeople;
     @ApiModelProperty(value = "收件电话")
-    private Integer receivePhone;
+    private String receivePhone;
     @ApiModelProperty(value = "收件地址")
     private String receiveAddress;
 }

src/main/java/com/boco/nbd/wios/manage/entity/dto/WarehouseSaveQuery.java

@@ -50,7 +50,7 @@ public class WarehouseSaveQuery {
     @ApiModelProperty(value = "收件人")
     private String receivePeople;
     @ApiModelProperty(value = "收件电话")
-    private Integer receivePhone;
+    private String receivePhone;
     @ApiModelProperty(value = "收件地址")
     private String receiveAddress;
 
@@ -151,11 +151,11 @@ public class WarehouseSaveQuery {
         this.receivePeople = receivePeople;
     }
 
-    public Integer getReceivePhone() {
+    public String getReceivePhone() {
         return receivePhone;
     }
 
-    public void setReceivePhone(Integer receivePhone) {
+    public void setReceivePhone(String receivePhone) {
         this.receivePhone = receivePhone;
     }
 

src/main/resources/bootstrap-dev.yml

 server:
-  port: 30350
+  port: 30360
 
 spring:
   application:

src/main/resources/bootstrap-test.yml

 server:
-  port: 30350
+  port: 30360
 
 spring:
   application:

src/main/resources/mybatis/mapper/extdb/common/WarehouseMapperEx.xml

@@ -67,56 +67,60 @@
 
     <select id="qryWarehouseList" parameterType="string" resultType="com.boco.nbd.wios.manage.entity.bo.WarehouseEx">
         select
-            tw.id,
-            tw.appkey,
-            tw.warehouse_leven_id,
-            tw.name,
-            tw.area,
-            tw.service_provider,
-            tw.warehouse_attribution,
-            tw.msg,
-            tw.status,
-            tw.is_enabled,
-            tw.create_time,
-            tw.create_account,
-            tw.modify_account,
-            tw.modify_time,
-            twl.parent_id parentId,
-            twl.path_code pathCode,
-            twl.path_name pathName
+        tw.id,
+        tw.appkey,
+        tw.warehouse_leven_id,
+        tw.name,
+        tw.area,
+        tw.service_provider,
+        tw.warehouse_attribution,
+        tw.msg,
+        tw.status,
+        tw.is_enabled,
+        tw.create_time,
+        tw.create_account,
+        tw.modify_account,
+        tw.modify_time,
+        tw.superior_warehouse_id,
+        tw.receive_people,
+        tw.receive_phone,
+        tw.receive_address,
+        twl.parent_id parentId,
+        twl.path_code pathCode,
+        twl.path_name pathName
         from
         t_warehouse tw
         LEFT JOIN t_warehouse_leven twl on tw.warehouse_leven_id = twl.id
         where
-            tw.status = 1
-            and twl.`status` = 1
-            and tw.appkey = #{appkey}
-            <if test="id != null and id != ''">
-                and tw.id = #{id}
-            </if>
-            <if test="isEnable != null">
-                and tw.is_enabled = #{isEnable}
-            </if>
-            <if test="serviceProviders != null and serviceProviders.size() > 0">
-                and tw.service_provider in
-                <foreach collection="serviceProviders" item="item" index="index"
-                         open="(" close=")" separator=",">
-                    #{item}
-                </foreach>
-            </if>
-            <if test="area != null and area != ''">
-                and tw.area = #{area}
-            </if>
-            <if test="warehouseAttribution != null and warehouseAttribution != ''">
-                and tw.warehouse_attribution = #{warehouseAttribution}
-            </if>
-            <if test="name != null and name != ''">
-                and tw.name like CONCAT('%',#{name},'%')
-            </if>
-            <if test="warehouseLevenId != null and warehouseLevenId != '' ">
-                and tw.warehouse_leven_id = #{warehouseLevenId}
-            </if>
-            order by tw.create_time desc
+        tw.status = 1
+        and twl.`status` = 1
+        and tw.appkey = #{appkey}
+        <if test="id != null and id != ''">
+            and tw.id = #{id}
+        </if>
+        <if test="isEnable != null">
+            and tw.is_enabled = #{isEnable}
+        </if>
+        <if test="serviceProviders != null and serviceProviders.size() > 0">
+            and tw.service_provider in
+            <foreach collection="serviceProviders" item="item" index="index"
+                     open="(" close=")" separator=",">
+                #{item}
+            </foreach>
+        </if>
+        <if test="area != null and area != ''">
+            and tw.area = #{area}
+        </if>
+        <if test="warehouseAttribution != null and warehouseAttribution != ''">
+            and tw.warehouse_attribution = #{warehouseAttribution}
+        </if>
+        <if test="name != null and name != ''">
+            and tw.name like CONCAT('%',#{name},'%')
+        </if>
+        <if test="warehouseLevenId != null and warehouseLevenId != '' ">
+            and tw.warehouse_leven_id = #{warehouseLevenId}
+        </if>
+        order by tw.create_time desc
     </select>
 
     <select id="qryWarehouseLeven" resultType="com.boco.nbd.wios.manage.entity.bo.WarehouseLeven">