From 18cfe1dfbe035089d1f132850004a74641f253b5 Mon Sep 17 00:00:00 2001
From: gongchunyi <deslre0381@gmail.com>
Date: 星期四, 16 四月 2026 15:17:48 +0800
Subject: [PATCH] feat: 部件已产品绑定
---
src/main/resources/mapper/production/ProductProcessMapper.xml | 25 ++++++++++++++++++++-----
1 files changed, 20 insertions(+), 5 deletions(-)
diff --git a/src/main/resources/mapper/production/ProductProcessMapper.xml b/src/main/resources/mapper/production/ProductProcessMapper.xml
index 5b1ac18..0ab44e7 100644
--- a/src/main/resources/mapper/production/ProductProcessMapper.xml
+++ b/src/main/resources/mapper/production/ProductProcessMapper.xml
@@ -4,18 +4,33 @@
<select id="listPage" resultType="com.ruoyi.production.dto.ProductProcessDto">
SELECT
- *
+ pp.id,
+ pp.no,
+ pp.remark,
+ pp.salary_quota,
+ pp.is_quality,
+ pp.planner_id,
+ pp.planner_name,
+ pp.update_time,
+ pp.type,
+ p.product_name AS name,
+ pm.model AS productModel
FROM
- product_process p
+ product_process pp
+ left join product_model pm ON pm.id = pp.product_model_id
+ left join product p ON p.id = pm.product_id
<where>
<if test="productProcessDto.name != null and productProcessDto.name != '' ">
- AND p.name LIKE CONCAT('%',#{productProcessDto.name},'%')
+ AND p.product_name LIKE CONCAT('%',#{productProcessDto.name},'%')
</if>
<if test="productProcessDto.no != null and productProcessDto.no != '' ">
- AND p.no LIKE CONCAT('%',#{productProcessDto.no},'%')
+ AND pp.no LIKE CONCAT('%',#{productProcessDto.no},'%')
+ </if>
+ <if test="productProcessDto.type != null">
+ AND pp.type = #{productProcessDto.type}
</if>
</where>
- order by p.id asc
+ order by pp.id asc
</select>
<select id="calculateProductionStatistics" resultType="com.ruoyi.home.dto.processDataProductionStatisticsDto">
--
Gitblit v1.9.3