根据是自建团队还是服务商查询服务商列表

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

@@ -29,6 +29,8 @@ public class SupplierBo extends Supplier {
 
 
     @ApiModelProperty(hidden = true)
     @ApiModelProperty(hidden = true)
     private List<String> ids;
     private List<String> ids;
+    @ApiModelProperty(value = "级别 A：自建精品团队 B：经销商安装服务团队 C：三方安装服务商")
+    private String level;
 
 
     public List<Integer> getOrderStatusNotInList() {
     public List<Integer> getOrderStatusNotInList() {
         return orderStatusNotInList;
         return orderStatusNotInList;
@@ -94,4 +96,13 @@ public class SupplierBo extends Supplier {
         this.ids = ids;
         this.ids = ids;
     }
     }
 
 
+    @Override
+    public String getLevel() {
+        return level;
+    }
+
+    @Override
+    public void setLevel(String level) {
+        this.level = level;
+    }
 }
 }

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

@@ -41,7 +41,7 @@ public class Warehouse extends CoreEntity {
 
 
     private String receivePeople;
     private String receivePeople;
 
 
-    private String receivePhone;
+    private Integer receivePhone;
 
 
     private String receiveAddress;
     private String receiveAddress;
 
 
@@ -173,11 +173,11 @@ public class Warehouse extends CoreEntity {
         this.receivePeople = receivePeople;
         this.receivePeople = receivePeople;
     }
     }
 
 
-    public String getReceivePhone() {
+    public Integer getReceivePhone() {
         return receivePhone;
         return receivePhone;
     }
     }
 
 
-    public void setReceivePhone(String receivePhone) {
+    public void setReceivePhone(Integer receivePhone) {
         this.receivePhone = receivePhone;
         this.receivePhone = receivePhone;
     }
     }
 
 

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

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

src/main/resources/mybatis/mapper/def/common/SupplierMapper.xml

@@ -393,6 +393,9 @@
             <if test="checkStatus != null">
             <if test="checkStatus != null">
                 and t.check_status = #{checkStatus}
                 and t.check_status = #{checkStatus}
             </if>
             </if>
+            <if test="level != null and level != ''">
+                and t.level = #{level}
+            </if>
         </where>
         </where>
         order by t.create_time desc
         order by t.create_time desc
         <if test="hasContract != null"><!-- 是否签了合同 -->
         <if test="hasContract != null"><!-- 是否签了合同 -->