From 7ff5e9edadf446d0d033574a7b0ae802f5ac2233 Mon Sep 17 00:00:00 2001
From: cl <418351270@qq.com>
Date: 星期六, 17 二月 2024 15:36:20 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
jcdm-main/src/main/resources/mapper/bs/formulaChild/BsFormulaChildInfoMapper.xml | 13 +++++++++++--
1 files changed, 11 insertions(+), 2 deletions(-)
diff --git a/jcdm-main/src/main/resources/mapper/bs/formulaChild/BsFormulaChildInfoMapper.xml b/jcdm-main/src/main/resources/mapper/bs/formulaChild/BsFormulaChildInfoMapper.xml
index 96d6d33..24ab904 100644
--- a/jcdm-main/src/main/resources/mapper/bs/formulaChild/BsFormulaChildInfoMapper.xml
+++ b/jcdm-main/src/main/resources/mapper/bs/formulaChild/BsFormulaChildInfoMapper.xml
@@ -41,7 +41,7 @@
<if test="processesCode != null and processesCode != ''"> and processes_code like concat('%', #{processesCode}, '%')</if>
<if test="productCode != null and productCode != ''"> and product_code like concat('%', #{productCode}, '%')</if>
<if test="operationType != null and operationType != ''"> and operation_type like concat('%', #{operationType}, '%')</if>
- <if test="formulaCode != null and formulaCode != ''"> and formula_code like concat('%', #{formulaCode}, '%')</if>
+ <if test="formulaCode != null and formulaCode != ''"> and formula_code = #{formulaCode}</if>
</where>
</select>
@@ -50,7 +50,16 @@
<include refid="selectBsFormulaChildInfoVo"/>
where id = #{id}
</select>
-
+
+ <select id="getProductProcess" parameterType="com.jcdm.main.bs.formulaChild.Query.ProductProcessQuery" resultMap="BsFormulaChildInfoResult">
+ <include refid="selectBsFormulaChildInfoVo"/>
+ <where>
+ <if test="processesCode != null and processesCode != '' ">and processes_code = #{processesCode}</if>
+ <if test="productCode != null and productCode != '' ">and product_code = #{productCode}</if>
+ </where>
+ order by step_sort
+ </select>
+
<insert id="insertBsFormulaChildInfo" parameterType="BsFormulaChildInfo" useGeneratedKeys="true" keyProperty="id">
insert into bs_formula_child_info
<trim prefix="(" suffix=")" suffixOverrides=",">
--
Gitblit v1.9.3