From 9ad4c5c1d7077ca9210327f73d4d57f5f425475e Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期六, 25 四月 2026 11:24:46 +0800
Subject: [PATCH] refactor(production): 优化生产计划分页查询筛选条件+生产计划去掉审核状态字段
---
src/main/java/com/ruoyi/production/bean/dto/ProductionPlanDto.java | 10 ++++++++++
src/main/java/com/ruoyi/production/pojo/ProductionPlan.java | 3 ---
src/main/resources/mapper/production/ProductionPlanMapper.xml | 22 ++++++++++++++++++++++
3 files changed, 32 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/ruoyi/production/bean/dto/ProductionPlanDto.java b/src/main/java/com/ruoyi/production/bean/dto/ProductionPlanDto.java
index a980ce2..60ab542 100644
--- a/src/main/java/com/ruoyi/production/bean/dto/ProductionPlanDto.java
+++ b/src/main/java/com/ruoyi/production/bean/dto/ProductionPlanDto.java
@@ -42,4 +42,14 @@
@Schema(description = "浜у搧ID")
private Long productId;
+ @Schema(description = "绛涢�夊紑濮嬫棩鏈�")
+ @JsonFormat(pattern = "yyyy-MM-dd")
+ @DateTimeFormat(pattern = "yyyy-MM-dd")
+ private LocalDate requiredDateStart;
+
+ @Schema(description = "绛涢�夌粨鏉熸棩鏈�")
+ @JsonFormat(pattern = "yyyy-MM-dd")
+ @DateTimeFormat(pattern = "yyyy-MM-dd")
+ private LocalDate requiredDateEnd;
+
}
diff --git a/src/main/java/com/ruoyi/production/pojo/ProductionPlan.java b/src/main/java/com/ruoyi/production/pojo/ProductionPlan.java
index b49e712..a71f425 100644
--- a/src/main/java/com/ruoyi/production/pojo/ProductionPlan.java
+++ b/src/main/java/com/ruoyi/production/pojo/ProductionPlan.java
@@ -80,9 +80,6 @@
@Schema(description = "鏉ユ簮 閿�鍞�/鍐呴儴")
private String source;
- @Schema(description = "瀹℃牳鐘舵��")
- private String isAudit;
-
@Schema(description = "鎵胯鏃ユ湡")
private LocalDate promisedDeliveryDate;
diff --git a/src/main/resources/mapper/production/ProductionPlanMapper.xml b/src/main/resources/mapper/production/ProductionPlanMapper.xml
index da0d293..9984fcf 100644
--- a/src/main/resources/mapper/production/ProductionPlanMapper.xml
+++ b/src/main/resources/mapper/production/ProductionPlanMapper.xml
@@ -30,6 +30,28 @@
FROM production_plan pp
left join product_model pm on pp.product_model_id = pm.id
left join product p on pm.product_id = p.id
+ <where>
+ <if test="c != null">
+ <if test="c.id != null">
+ and pp.id = #{c.id}
+ </if>
+ <if test="c.productName != null and c.productName != ''">
+ and p.product_name like concat('%', #{c.productName}, '%')
+ </if>
+ <if test="c.model != null and c.model != ''">
+ and pm.model like concat('%', #{c.model}, '%')
+ </if>
+ <if test="c.status != null">
+ and pp.status = #{c.status}
+ </if>
+ <if test="c.mpsNo != null and c.mpsNo != ''">
+ and pp.mps_no like concat('%', #{c.mpsNo}, '%')
+ </if>
+ <if test="c.requiredDateStart != null and c.requiredDateEnd != null">
+ and pp.required_date between #{c.requiredDateStart} and #{c.requiredDateEnd}
+ </if>
+ </if>
+ </where>
ORDER BY COALESCE(pp.id) DESC
</select>
--
Gitblit v1.9.3