Commit f0fe3503 authored by 332784038@qq.com's avatar 332784038@qq.com

sql优化

parent 2691febe
...@@ -775,8 +775,12 @@ public class OrderQueryVO { ...@@ -775,8 +775,12 @@ public class OrderQueryVO {
if (Objects.isNull(this.shipmentStateList)){ if (Objects.isNull(this.shipmentStateList)){
this.shipmentStateList = new ArrayList<>(); this.shipmentStateList = new ArrayList<>();
} }
if (!this.statusList.contains(12)) {
this.statusList.add(12); this.statusList.add(12);
}
if (!this.shipmentStateList.contains(325)) {
this.shipmentStateList.add(325); this.shipmentStateList.add(325);
}
break; break;
case 10501: case 10501:
// 空运待出 // 空运待出
...@@ -789,10 +793,18 @@ public class OrderQueryVO { ...@@ -789,10 +793,18 @@ public class OrderQueryVO {
if (Objects.isNull(this.abnormalStateList)){ if (Objects.isNull(this.abnormalStateList)){
this.abnormalStateList = new ArrayList<>(); this.abnormalStateList = new ArrayList<>();
} }
if (!this.statusList.contains(5)) {
this.statusList.add(5); this.statusList.add(5);
}
if (!this.airShipmentList.contains(1)) {
this.airShipmentList.add(1); this.airShipmentList.add(1);
}
if (!this.auditTypeList.contains(0)) {
this.auditTypeList.add(0); this.auditTypeList.add(0);
}
if (!this.abnormalStateList.contains(0)) {
this.abnormalStateList.add(0); this.abnormalStateList.add(0);
}
// this.transportId = 3; // 空运待出查询,只查空运的订单 // this.transportId = 3; // 空运待出查询,只查空运的订单
break; break;
case 10502: case 10502:
...@@ -800,8 +812,12 @@ public class OrderQueryVO { ...@@ -800,8 +812,12 @@ public class OrderQueryVO {
if (Objects.isNull(this.airShipmentList)){ if (Objects.isNull(this.airShipmentList)){
this.airShipmentList = new ArrayList<>(); this.airShipmentList = new ArrayList<>();
} }
if (!this.statusList.contains(5)) {
this.statusList.add(5); this.statusList.add(5);
}
if (!this.airShipmentList.contains(12)) {
this.airShipmentList.add(12); this.airShipmentList.add(12);
}
// this.transportId = 3; // 空运待出查询,只查空运的订单 // this.transportId = 3; // 空运待出查询,只查空运的订单
break; break;
case 10503: case 10503:
...@@ -809,8 +825,12 @@ public class OrderQueryVO { ...@@ -809,8 +825,12 @@ public class OrderQueryVO {
if (Objects.isNull(this.airShipmentList)){ if (Objects.isNull(this.airShipmentList)){
this.airShipmentList = new ArrayList<>(); this.airShipmentList = new ArrayList<>();
} }
if (!this.statusList.contains(5)) {
this.statusList.add(5); this.statusList.add(5);
}
if (!this.airShipmentList.contains(4)) {
this.airShipmentList.add(4); this.airShipmentList.add(4);
}
// this.transportId = 3; // 空运待出查询,只查空运的订单 // this.transportId = 3; // 空运待出查询,只查空运的订单
break; break;
case 10504: case 10504:
...@@ -824,25 +844,38 @@ public class OrderQueryVO { ...@@ -824,25 +844,38 @@ public class OrderQueryVO {
if (Objects.isNull(this.abnormalStateList)){ if (Objects.isNull(this.abnormalStateList)){
this.abnormalStateList = new ArrayList<>(); this.abnormalStateList = new ArrayList<>();
} }
if (!this.statusList.contains(5)) {
this.statusList.add(5); this.statusList.add(5);
}
if (!this.auditTypeList.contains(0)) {
this.auditTypeList.add(0); this.auditTypeList.add(0);
}
if (!this.abnormalStateList.contains(0)) {
this.abnormalStateList.add(0); this.abnormalStateList.add(0);
}
if (Objects.nonNull(transportId) && transportId == 3) { if (Objects.nonNull(transportId) && transportId == 3) {
// 空运无需判断备货状态 可出、备货中、已备货 // 空运无需判断备货状态 可出、备货中、已备货
if (!this.airShipmentList.contains(10)) {
this.airShipmentList.add(10); this.airShipmentList.add(10);
}
}else { }else {
// 兼容空运已入仓的可出、备货中、已备货,且无异常无审批,海运的已入仓无异常无审批 // 兼容空运已入仓的可出、备货中、已备货,且无异常无审批,海运的已入仓无异常无审批
if (!this.airShipmentList.contains(20)) {
this.airShipmentList.add(20); this.airShipmentList.add(20);
} }
}
break; break;
case 132411: case 132411:
// 空运已出货 // 空运已出货
if (Objects.isNull(this.shipmentStateList)){ if (Objects.isNull(this.shipmentStateList)){
this.shipmentStateList = new ArrayList<>(); this.shipmentStateList = new ArrayList<>();
} }
if (!this.statusList.contains(32)) {
this.statusList.add(32); this.statusList.add(32);
}
if (!this.shipmentStateList.contains(411)) {
this.shipmentStateList.add(411); this.shipmentStateList.add(411);
}
// this.transportId = 3; // 空运待出查询,只查空运的订单 // this.transportId = 3; // 空运待出查询,只查空运的订单
break; break;
case 132412: case 132412:
...@@ -850,8 +883,12 @@ public class OrderQueryVO { ...@@ -850,8 +883,12 @@ public class OrderQueryVO {
if (Objects.isNull(this.shipmentStateList)){ if (Objects.isNull(this.shipmentStateList)){
this.shipmentStateList = new ArrayList<>(); this.shipmentStateList = new ArrayList<>();
} }
if (!this.statusList.contains(32)) {
this.statusList.add(32); this.statusList.add(32);
}
if (!this.shipmentStateList.contains(412)) {
this.shipmentStateList.add(412); this.shipmentStateList.add(412);
}
// this.transportId = 3; // 空运待出查询,只查空运的订单 // this.transportId = 3; // 空运待出查询,只查空运的订单
break; break;
case 132409: case 132409:
...@@ -859,8 +896,12 @@ public class OrderQueryVO { ...@@ -859,8 +896,12 @@ public class OrderQueryVO {
if (Objects.isNull(this.shipmentStateList)){ if (Objects.isNull(this.shipmentStateList)){
this.shipmentStateList = new ArrayList<>(); this.shipmentStateList = new ArrayList<>();
} }
if (!this.statusList.contains(32)) {
this.statusList.add(32); this.statusList.add(32);
}
if (!this.shipmentStateList.contains(409)) {
this.shipmentStateList.add(409); this.shipmentStateList.add(409);
}
// this.transportId = 3; // 空运待出查询,只查空运的订单 // this.transportId = 3; // 空运待出查询,只查空运的订单
break; break;
case 118428: case 118428:
...@@ -868,14 +909,20 @@ public class OrderQueryVO { ...@@ -868,14 +909,20 @@ public class OrderQueryVO {
if (Objects.isNull(this.shipmentStateList)){ if (Objects.isNull(this.shipmentStateList)){
this.shipmentStateList = new ArrayList<>(); this.shipmentStateList = new ArrayList<>();
} }
if (!this.statusList.contains(32)) {
this.statusList.add(32); this.statusList.add(32);
}
if (!this.shipmentStateList.contains(428)) {
this.shipmentStateList.add(428); this.shipmentStateList.add(428);
}
// this.transportId = 3; // 空运待出查询,只查空运的订单 // this.transportId = 3; // 空运待出查询,只查空运的订单
break; break;
default: default:
if (!this.statusList.contains(asStatus)) {
this.statusList.add(asStatus); this.statusList.add(asStatus);
} }
} }
}
public void setShipmentState(Integer shipmentState) { public void setShipmentState(Integer shipmentState) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment