From dc78a7b2b16b490ed60a9c2dbf3abe789b3b8d5b Mon Sep 17 00:00:00 2001
From: "han\\hanst" <songtao.han@xujiesoft.com>
Date: Wed, 22 Apr 2026 15:48:39 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B1=82=E6=95=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/longchuang/data/ProductionPlanOrderQueryData.java | 1 +
 src/main/resources/mapper/longchuang/ProductionPlanMapper.xml | 4 ++++
 2 files changed, 5 insertions(+)

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 @@
             <if test="query.color != null and query.color != ''">
                 and a.color like '%' + #{query.color} + '%'
             </if>
+            <if test="query.floorCount != null and query.floorCount != ''">
+                and a.floor_count = #{query.floorCount}
+            </if>
             <if test="query.status != null and query.status != ''">
                 and a.status = #{query.status}
             </if>
@@ -92,6 +95,7 @@
                   and s.order_type = a.order_type
                   and s.assignee_user_id = #{userId}
             )
+            and a.status != '已完成'
             <if test="query.orderType != null and query.orderType != ''">
                 and a.order_type = #{query.orderType}
             </if>