diff --git a/src/main/java/com/xujie/sys/modules/longchuang/data/ProductionPlanOrderQueryData.java b/src/main/java/com/xujie/sys/modules/longchuang/data/ProductionPlanOrderQueryData.java index e2faa3b..e5c5f48 100644 --- a/src/main/java/com/xujie/sys/modules/longchuang/data/ProductionPlanOrderQueryData.java +++ b/src/main/java/com/xujie/sys/modules/longchuang/data/ProductionPlanOrderQueryData.java @@ -4,6 +4,8 @@ import com.xujie.sys.common.utils.QueryPage; import lombok.Data; import lombok.EqualsAndHashCode; +import java.util.List; + @Data @EqualsAndHashCode(callSuper = true) public class ProductionPlanOrderQueryData extends QueryPage { @@ -20,4 +22,5 @@ public class ProductionPlanOrderQueryData extends QueryPage { private String planStartDate; private String planEndDate; private Integer floorCount; + private List statusList; } diff --git a/src/main/resources/mapper/longchuang/ProductionPlanMapper.xml b/src/main/resources/mapper/longchuang/ProductionPlanMapper.xml index 077bd26..2c7f140 100644 --- a/src/main/resources/mapper/longchuang/ProductionPlanMapper.xml +++ b/src/main/resources/mapper/longchuang/ProductionPlanMapper.xml @@ -50,6 +50,12 @@ and a.status = #{query.status} + + AND a.status in + + #{status} + + and a.plan_delivery_date =]]> #{query.deliveryStartDate}