diff --git a/src/main/java/com/xujie/sys/modules/deliverySchedule/data/DeliveryPlanData.java b/src/main/java/com/xujie/sys/modules/deliverySchedule/data/DeliveryPlanData.java index 14afbe3..d9aba07 100644 --- a/src/main/java/com/xujie/sys/modules/deliverySchedule/data/DeliveryPlanData.java +++ b/src/main/java/com/xujie/sys/modules/deliverySchedule/data/DeliveryPlanData.java @@ -39,6 +39,9 @@ public class DeliveryPlanData extends QueryPage implements Serializable { @TableField(value = "Status") private String Status; + @TableField(exist = false) + private List StatusList; + @TableField(value = "NotifyQty") private Double NotifyQty; diff --git a/src/main/java/com/xujie/sys/modules/deliverySchedule/data/DeliveryScheduleData.java b/src/main/java/com/xujie/sys/modules/deliverySchedule/data/DeliveryScheduleData.java index 97d160d..e0cd3cb 100644 --- a/src/main/java/com/xujie/sys/modules/deliverySchedule/data/DeliveryScheduleData.java +++ b/src/main/java/com/xujie/sys/modules/deliverySchedule/data/DeliveryScheduleData.java @@ -34,6 +34,9 @@ public class DeliveryScheduleData extends QueryPage implements Serializable { @TableField(value = "Status") private String Status; + @TableField(exist = false) + private List StatusList; + @TableField(value = "Qty") private Double Qty; diff --git a/src/main/java/com/xujie/sys/modules/deliverySchedule/service/impl/DeliveryScheduleServiceImpl.java b/src/main/java/com/xujie/sys/modules/deliverySchedule/service/impl/DeliveryScheduleServiceImpl.java index 807d3a1..49368ee 100644 --- a/src/main/java/com/xujie/sys/modules/deliverySchedule/service/impl/DeliveryScheduleServiceImpl.java +++ b/src/main/java/com/xujie/sys/modules/deliverySchedule/service/impl/DeliveryScheduleServiceImpl.java @@ -68,7 +68,7 @@ public class DeliveryScheduleServiceImpl extends ServiceImpl AND PODN.Username like #{query.UserName} - - AND PODN.Status = #{query.Status} + + AND PODN.status in + + #{item} + AND PODN.WantedDelDate >= #{query.WantedDelStartDate}