From 831163b8a651e5b4e752581d48762f4f7db4ed80 Mon Sep 17 00:00:00 2001
From: gongchunyi <deslre0381@gmail.com>
Date: 星期三, 11 三月 2026 17:43:05 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_宁夏_中盛建材' into dev_宁夏_中盛建材
---
src/main/resources/mapper/productionPlan/ProductionPlanMapper.xml | 22 ++++++++++++++++++++--
1 files changed, 20 insertions(+), 2 deletions(-)
diff --git a/src/main/resources/mapper/productionPlan/ProductionPlanMapper.xml b/src/main/resources/mapper/productionPlan/ProductionPlanMapper.xml
index 0b205d6..b4bea0a 100644
--- a/src/main/resources/mapper/productionPlan/ProductionPlanMapper.xml
+++ b/src/main/resources/mapper/productionPlan/ProductionPlanMapper.xml
@@ -38,10 +38,28 @@
</resultMap>
- <select id="listPage" resultMap="ProductionPlanResultMap">
+ <select id="listPage" resultType="com.ruoyi.productionPlan.dto.ProductionPlanDto">
SELECT *
- FROM production_plan
+ FROM production_plan pp
WHERE 1 = 1
+ <if test="c.customerName != null and c.customerName != '' ">
+ AND pp.customer_name LIKE CONCAT('%',#{c.customerName},'%')
+ </if>
+ <if test="c.productName != null and c.productName != '' ">
+ AND pp.product_name LIKE CONCAT('%',#{c.productName},'%')
+ </if>
+ <if test="c.productSpec != null and c.productSpec != '' ">
+ AND pp.product_spec LIKE CONCAT('%',#{c.productSpec},'%')
+ </if>
+ <if test="c.materialCode != null and c.materialCode != '' ">
+ AND pp.material_code LIKE CONCAT('%',#{c.materialCode},'%')
+ </if>
+ <if test="c.startDate != null">
+ AND pp.start_date >= DATE_FORMAT(#{c.startDate},'%Y-%m-%d')
+ </if>
+ <if test="c.endDate != null">
+ AND pp.end_date <= DATE_FORMAT(#{c.endDate},'%Y-%m-%d')
+ </if>
</select>
<select id="selectSummaryByProductType" resultType="com.ruoyi.productionPlan.dto.ProductionPlanSummaryDto">
--
Gitblit v1.9.3