From 7d6be866a896e03fb311ba0d491a9382809c7111 Mon Sep 17 00:00:00 2001
From: huminmin <mac@MacBook-Pro.local>
Date: 星期四, 22 一月 2026 09:43:57 +0800
Subject: [PATCH] 1.修改人员离职原因分析逻辑 2.新增离职设置原因和备注
---
src/main/resources/mapper/production/ProductStructureMapper.xml | 43 +++++++++++++++++++++++++++++++++++--------
1 files changed, 35 insertions(+), 8 deletions(-)
diff --git a/src/main/resources/mapper/production/ProductStructureMapper.xml b/src/main/resources/mapper/production/ProductStructureMapper.xml
index 61a3f4a..e4a0795 100644
--- a/src/main/resources/mapper/production/ProductStructureMapper.xml
+++ b/src/main/resources/mapper/production/ProductStructureMapper.xml
@@ -2,15 +2,42 @@
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.ruoyi.production.mapper.ProductStructureMapper">
-
- <select id="listByproductModelId" resultType="com.ruoyi.production.dto.ProductStructureDto">
+ <resultMap id="basicMap" type="com.ruoyi.production.pojo.ProductStructure">
+ <id property="id" column="id"/>
+ <result property="productModelId" column="product_model_id"/>
+ <result property="processId" column="process_id"/>
+ <result property="unitQuantity" column="unit_quantity"/>
+ <result property="demandedQuantity" column="demanded_quantity"/>
+ <result property="unit" column="unit"/>
+ <result property="tenantId" column="tenant_id"/>
+ </resultMap>
+ <select id="listBybomId" resultType="com.ruoyi.production.dto.ProductStructureDto">
select ps.*,
- pm.speculative_trading_name ,
- pp.name as process_name
+ p.product_name,
+ pp.name as process_name,
+ pm.product_id,
+ pm.model
from
- product_structure ps
- left join product_model pm on ps.product_model_id = pm.id
- left join product_process pp on ps.process_id = pp.id
- where pm.id = #{productId}
+ product_structure ps
+ left join product_model pm on ps.product_model_id = pm.id
+ left join product p on pm.product_id = p.id
+ left join product_process pp on ps.process_id = pp.id
+ where ps.bom_id = #{bomId}
+ order by ps.id
+ </select>
+ <select id="listBybomAndProcess" resultType="com.ruoyi.production.dto.ProductStructureDto">
+ select ps.*,
+ p.product_name,
+ pp.name as process_name,
+ pm.product_id,
+ pm.model
+ from
+ product_structure ps
+ left join product_model pm on ps.product_model_id = pm.id
+ left join product p on pm.product_id = p.id
+ left join product_process pp on ps.process_id = pp.id
+ where ps.bom_id = #{bomId}
+ and ps.process_id=#{processId}
+ order by ps.id
</select>
</mapper>
--
Gitblit v1.9.3