提交 8b07388d 作者: zhangqiliang

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

父级 53176e39
......@@ -29,6 +29,8 @@ public class SupplierBo extends Supplier {
@ApiModelProperty(hidden = true)
private List<String> ids;
@ApiModelProperty(value = "级别 A:自建精品团队 B:经销商安装服务团队 C:三方安装服务商")
private String level;
public List<Integer> getOrderStatusNotInList() {
return orderStatusNotInList;
......@@ -94,4 +96,13 @@ public class SupplierBo extends Supplier {
this.ids = ids;
}
@Override
public String getLevel() {
return level;
}
@Override
public void setLevel(String level) {
this.level = level;
}
}
......@@ -41,7 +41,7 @@ public class Warehouse extends CoreEntity {
private String receivePeople;
private String receivePhone;
private Integer receivePhone;
private String receiveAddress;
......@@ -173,11 +173,11 @@ public class Warehouse extends CoreEntity {
this.receivePeople = receivePeople;
}
public String getReceivePhone() {
public Integer getReceivePhone() {
return receivePhone;
}
public void setReceivePhone(String receivePhone) {
public void setReceivePhone(Integer receivePhone) {
this.receivePhone = receivePhone;
}
......
......@@ -50,7 +50,7 @@ public class WarehouseSaveQuery {
@ApiModelProperty(value = "收件人")
private String receivePeople;
@ApiModelProperty(value = "收件电话")
private String receivePhone;
private Integer receivePhone;
@ApiModelProperty(value = "收件地址")
private String receiveAddress;
......@@ -151,11 +151,11 @@ public class WarehouseSaveQuery {
this.receivePeople = receivePeople;
}
public String getReceivePhone() {
public Integer getReceivePhone() {
return receivePhone;
}
public void setReceivePhone(String receivePhone) {
public void setReceivePhone(Integer receivePhone) {
this.receivePhone = receivePhone;
}
......
......@@ -393,6 +393,9 @@
<if test="checkStatus != null">
and t.check_status = #{checkStatus}
</if>
<if test="level != null and level != ''">
and t.level = #{level}
</if>
</where>
order by t.create_time desc
<if test="hasContract != null"><!-- 是否签了合同 -->
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论