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 cbb33e9..e2faa3b 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 @@ -19,4 +19,5 @@ public class ProductionPlanOrderQueryData extends QueryPage { private String deliveryEndDate; private String planStartDate; private String planEndDate; + private Integer floorCount; } diff --git a/src/main/resources/mapper/longchuang/ProductionPlanMapper.xml b/src/main/resources/mapper/longchuang/ProductionPlanMapper.xml index 0e3beef..9a7032d 100644 --- a/src/main/resources/mapper/longchuang/ProductionPlanMapper.xml +++ b/src/main/resources/mapper/longchuang/ProductionPlanMapper.xml @@ -44,6 +44,9 @@ and a.color like '%' + #{query.color} + '%' + + and a.floor_count = #{query.floorCount} + and a.status = #{query.status} @@ -92,6 +95,7 @@ and s.order_type = a.order_type and s.assignee_user_id = #{userId} ) + and a.status != '已完成' and a.order_type = #{query.orderType}