Skip to content

W
warehouse
提交 a35799a4 作者: zhangqiliang
操作

仓库管理的查询的优化

父级 ac22758b
正在显示 包含 63 行增加 和 59 行删除
src/main/java/com/boco/nbd/wios/manage/entity/bo/Warehouse.java
...@@ -37,11 +37,11 @@ public class Warehouse extends CoreEntity { ...@@ -37,11 +37,11 @@ public class Warehouse extends CoreEntity {
private Integer isEnabled; private Integer isEnabled;
private Integer superiorWarehouseId; private String superiorWarehouseId;
private String receivePeople; private String receivePeople;
private Integer receivePhone; private String receivePhone;
private String receiveAddress; private String receiveAddress;
...@@ -157,11 +157,11 @@ public class Warehouse extends CoreEntity { ...@@ -157,11 +157,11 @@ public class Warehouse extends CoreEntity {
this.isEnabled = isEnabled; this.isEnabled = isEnabled;
} }
public Integer getSuperiorWarehouseId() { public String getSuperiorWarehouseId() {
return superiorWarehouseId; return superiorWarehouseId;
} }
public void setSuperiorWarehouseId(Integer superiorWarehouseId) { public void setSuperiorWarehouseId(String superiorWarehouseId) {
this.superiorWarehouseId = superiorWarehouseId; this.superiorWarehouseId = superiorWarehouseId;
} }
...@@ -173,11 +173,11 @@ public class Warehouse extends CoreEntity { ...@@ -173,11 +173,11 @@ public class Warehouse extends CoreEntity {
this.receivePeople = receivePeople; this.receivePeople = receivePeople;
} }
public Integer getReceivePhone() { public String getReceivePhone() {
return receivePhone; return receivePhone;
} }
public void setReceivePhone(Integer receivePhone) { public void setReceivePhone(String receivePhone) {
this.receivePhone = 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 { ...@@ -70,11 +70,11 @@ public class WarehouseDTO implements Serializable {
@ApiModelProperty(value = "全路径名称") @ApiModelProperty(value = "全路径名称")
private String pathName; private String pathName;
@ApiModelProperty(value = "上级仓库ID") @ApiModelProperty(value = "上级仓库ID")
private Integer superiorWarehouseId; private String superiorWarehouseId;
@ApiModelProperty(value = "收件人") @ApiModelProperty(value = "收件人")
private String receivePeople; private String receivePeople;
@ApiModelProperty(value = "收件电话") @ApiModelProperty(value = "收件电话")
private Integer receivePhone; private String receivePhone;
@ApiModelProperty(value = "收件地址") @ApiModelProperty(value = "收件地址")
private String receiveAddress; private String receiveAddress;
} }
src/main/java/com/boco/nbd/wios/manage/entity/dto/WarehouseSaveQuery.java
...@@ -50,7 +50,7 @@ public class WarehouseSaveQuery { ...@@ -50,7 +50,7 @@ public class WarehouseSaveQuery {
@ApiModelProperty(value = "收件人") @ApiModelProperty(value = "收件人")
private String receivePeople; private String receivePeople;
@ApiModelProperty(value = "收件电话") @ApiModelProperty(value = "收件电话")
private Integer receivePhone; private String receivePhone;
@ApiModelProperty(value = "收件地址") @ApiModelProperty(value = "收件地址")
private String receiveAddress; private String receiveAddress;
...@@ -151,11 +151,11 @@ public class WarehouseSaveQuery { ...@@ -151,11 +151,11 @@ public class WarehouseSaveQuery {
this.receivePeople = receivePeople; this.receivePeople = receivePeople;
} }
public Integer getReceivePhone() { public String getReceivePhone() {
return receivePhone; return receivePhone;
} }
public void setReceivePhone(Integer receivePhone) { public void setReceivePhone(String receivePhone) {
this.receivePhone = receivePhone; this.receivePhone = receivePhone;
} }
......
src/main/resources/bootstrap-dev.yml
server: server:
port: 30350 port: 30360
spring: spring:
application: application:
......
src/main/resources/bootstrap-test.yml
server: server:
port: 30350 port: 30360
spring: spring:
application: application:
......
src/main/resources/mybatis/mapper/extdb/common/WarehouseMapperEx.xml
...@@ -67,56 +67,60 @@ ...@@ -67,56 +67,60 @@
<select id="qryWarehouseList" parameterType="string" resultType="com.boco.nbd.wios.manage.entity.bo.WarehouseEx"> <select id="qryWarehouseList" parameterType="string" resultType="com.boco.nbd.wios.manage.entity.bo.WarehouseEx">
select select
tw.id, tw.id,
tw.appkey, tw.appkey,
tw.warehouse_leven_id, tw.warehouse_leven_id,
tw.name, tw.name,
tw.area, tw.area,
tw.service_provider, tw.service_provider,
tw.warehouse_attribution, tw.warehouse_attribution,
tw.msg, tw.msg,
tw.status, tw.status,
tw.is_enabled, tw.is_enabled,
tw.create_time, tw.create_time,
tw.create_account, tw.create_account,
tw.modify_account, tw.modify_account,
tw.modify_time, tw.modify_time,
twl.parent_id parentId, tw.superior_warehouse_id,
twl.path_code pathCode, tw.receive_people,
twl.path_name pathName tw.receive_phone,
tw.receive_address,
twl.parent_id parentId,
twl.path_code pathCode,
twl.path_name pathName
from from
t_warehouse tw t_warehouse tw
LEFT JOIN t_warehouse_leven twl on tw.warehouse_leven_id = twl.id LEFT JOIN t_warehouse_leven twl on tw.warehouse_leven_id = twl.id
where where
tw.status = 1 tw.status = 1
and twl.`status` = 1 and twl.`status` = 1
and tw.appkey = #{appkey} and tw.appkey = #{appkey}
<if test="id != null and id != ''"> <if test="id != null and id != ''">
and tw.id = #{id} and tw.id = #{id}
</if> </if>
<if test="isEnable != null"> <if test="isEnable != null">
and tw.is_enabled = #{isEnable} and tw.is_enabled = #{isEnable}
</if> </if>
<if test="serviceProviders != null and serviceProviders.size() > 0"> <if test="serviceProviders != null and serviceProviders.size() > 0">
and tw.service_provider in and tw.service_provider in
<foreach collection="serviceProviders" item="item" index="index" <foreach collection="serviceProviders" item="item" index="index"
open="(" close=")" separator=","> open="(" close=")" separator=",">
#{item} #{item}
</foreach> </foreach>
</if> </if>
<if test="area != null and area != ''"> <if test="area != null and area != ''">
and tw.area = #{area} and tw.area = #{area}
</if> </if>
<if test="warehouseAttribution != null and warehouseAttribution != ''"> <if test="warehouseAttribution != null and warehouseAttribution != ''">
and tw.warehouse_attribution = #{warehouseAttribution} and tw.warehouse_attribution = #{warehouseAttribution}
</if> </if>
<if test="name != null and name != ''"> <if test="name != null and name != ''">
and tw.name like CONCAT('%',#{name},'%') and tw.name like CONCAT('%',#{name},'%')
</if> </if>
<if test="warehouseLevenId != null and warehouseLevenId != '' "> <if test="warehouseLevenId != null and warehouseLevenId != '' ">
and tw.warehouse_leven_id = #{warehouseLevenId} and tw.warehouse_leven_id = #{warehouseLevenId}
</if> </if>
order by tw.create_time desc order by tw.create_time desc
</select> </select>
<select id="qryWarehouseLeven" resultType="com.boco.nbd.wios.manage.entity.bo.WarehouseLeven"> <select id="qryWarehouseLeven" resultType="com.boco.nbd.wios.manage.entity.bo.WarehouseLeven">
......
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论