From 877504ede165b8c965b6cf6599708e7e48778034 Mon Sep 17 00:00:00 2001
From: liyong <18434998025@163.com>
Date: 星期四, 08 一月 2026 15:33:40 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/jtwy' into jtwy
---
src/main/resources/mapper/production/ProductOrderMapper.xml | 15 ++++++---------
1 files changed, 6 insertions(+), 9 deletions(-)
diff --git a/src/main/resources/mapper/production/ProductOrderMapper.xml b/src/main/resources/mapper/production/ProductOrderMapper.xml
index 7f84013..616d12f 100644
--- a/src/main/resources/mapper/production/ProductOrderMapper.xml
+++ b/src/main/resources/mapper/production/ProductOrderMapper.xml
@@ -14,29 +14,26 @@
<result property="updateTime" column="update_time"/>
</resultMap>
<select id="pageProductOrder" resultType="com.ruoyi.production.dto.ProductOrderDto">
- select po.*,sl.sales_contract_no,sl.project_name,sl.customer_name,slp.product_category,slp.specification_model
+ select po.*,sl.sales_contract_no,sl.customer_name,slp.product_category,slp.specification_model
from product_order po
left join sales_ledger sl on po.sales_ledger_id = sl.id
left join sales_ledger_product slp on po.product_model_id = slp.id
left join process_route pr on po.route_id = pr.id
<where>
<if test="c.npsNo != null and c.npsNo != ''">
- and po.nps_no = #{c.npsNo}
+ and po.nps_no like concat('%',#{c.npsNo},'%')
</if>
<if test="c.salesContractNo != null and c.salesContractNo != ''">
- and sl.sales_contract_no = #{c.salesContractNo}
- </if>
- <if test="c.projectName != null and c.projectName != ''">
- and sl.project_name = #{c.projectName}
+ and sl.sales_contract_no like concat('%',#{c.salesContractNo},'%')
</if>
<if test="c.customerName != null and c.customerName != ''">
- and sl.customer_name = #{c.customerName}
+ and sl.customer_name like concat('%',#{c.customerName},'%')
</if>
<if test="c.productCategory != null and c.productCategory != ''">
- and slp.product_category = #{c.productCategory}
+ and slp.product_category like concat('%',#{c.productCategory},'%')
</if>
<if test="c.specificationModel != null and c.specificationModel != ''">
- and slp.specification_model = #{c.specificationModel}
+ and slp.specification_model like concat('%',#{c.specificationModel},'%')
</if>
</where>
</select>
--
Gitblit v1.9.3