From 0d7d6a88080dc8759ef84ed5ad7875f25642df6c Mon Sep 17 00:00:00 2001
From: yantian yue <306727702@qq.com>
Date: 星期一, 23 十月 2023 10:59:18 +0800
Subject: [PATCH] OPCUA更新
---
guns-vip-main/src/main/java/cn/stylefeng/guns/modular/zsx/bs/formula/mapper/mapping/FormulaInfoMapper.xml | 15 ++++++++++++++-
1 files changed, 14 insertions(+), 1 deletions(-)
diff --git a/guns-vip-main/src/main/java/cn/stylefeng/guns/modular/zsx/bs/formula/mapper/mapping/FormulaInfoMapper.xml b/guns-vip-main/src/main/java/cn/stylefeng/guns/modular/zsx/bs/formula/mapper/mapping/FormulaInfoMapper.xml
index 6deefb7..8e62733 100644
--- a/guns-vip-main/src/main/java/cn/stylefeng/guns/modular/zsx/bs/formula/mapper/mapping/FormulaInfoMapper.xml
+++ b/guns-vip-main/src/main/java/cn/stylefeng/guns/modular/zsx/bs/formula/mapper/mapping/FormulaInfoMapper.xml
@@ -11,6 +11,7 @@
<result column="spare_field_1" property="spareField1" />
<result column="spare_field_2" property="spareField2" />
<result column="remark" property="remark" />
+ <result column="product_code" property="productCode" />
<result column="create_user" property="createUser" />
<result column="create_time" property="createTime" />
<result column="update_user" property="updateUser" />
@@ -19,7 +20,7 @@
<!-- 閫氱敤鏌ヨ缁撴灉鍒� -->
<sql id="Base_Column_List">
- id AS "id", formula_code AS "formulaCode", formula_name AS "formulaName", status AS "status", spare_field_1 AS "spareField1", spare_field_2 AS "spareField2", remark AS "remark", create_user AS "createUser", create_time AS "createTime", update_user AS "updateUser", update_time AS "updateTime"
+ product_code AS "productCode", id AS "id", formula_code AS "formulaCode", formula_name AS "formulaName", status AS "status", spare_field_1 AS "spareField1", spare_field_2 AS "spareField2", remark AS "remark", create_user AS "createUser", create_time AS "createTime", update_user AS "updateUser", update_time AS "updateTime"
</sql>
@@ -33,6 +34,9 @@
<if test="paramCondition.formulaName != null and paramCondition.formulaName != ''">
and formula_name like CONCAT('%',#{paramCondition.formulaName},'%')
</if>
+ <if test="paramCondition.productCode != null and paramCondition.productCode != ''">
+ and product_code like CONCAT('%',#{paramCondition.productCode},'%')
+ </if>
</select>
<select id="customMapList" resultType="map" parameterType="cn.stylefeng.guns.modular.zsx.bs.formula.model.params.FormulaInfoParam">
@@ -44,6 +48,9 @@
</if>
<if test="paramCondition.formulaName != null and paramCondition.formulaName != ''">
and formula_name like CONCAT('%',#{paramCondition.formulaName},'%')
+ </if>
+ <if test="paramCondition.productCode != null and paramCondition.productCode != ''">
+ and product_code like CONCAT('%',#{paramCondition.productCode},'%')
</if>
</select>
@@ -57,6 +64,9 @@
<if test="paramCondition.formulaName != null and paramCondition.formulaName != ''">
and formula_name like CONCAT('%',#{paramCondition.formulaName},'%')
</if>
+ <if test="paramCondition.productCode != null and paramCondition.productCode != ''">
+ and product_code like CONCAT('%',#{paramCondition.productCode},'%')
+ </if>
</select>
<select id="customPageMapList" resultType="map" parameterType="cn.stylefeng.guns.modular.zsx.bs.formula.model.params.FormulaInfoParam">
@@ -69,6 +79,9 @@
<if test="paramCondition.formulaName != null and paramCondition.formulaName != ''">
and formula_name like CONCAT('%',#{paramCondition.formulaName},'%')
</if>
+ <if test="paramCondition.productCode != null and paramCondition.productCode != ''">
+ and product_code like CONCAT('%',#{paramCondition.productCode},'%')
+ </if>
</select>
</mapper>
--
Gitblit v1.9.3