From 386e107222d673a1ea2781a03a7b1b1d28212f58 Mon Sep 17 00:00:00 2001
From: yyt <306727702@qq.com>
Date: 星期六, 17 二月 2024 16:43:10 +0800
Subject: [PATCH] 更新OPCUA
---
jcdm-main/src/main/resources/mapper/da/paramCollection/DaParamCollectionMapper.xml | 14 ++++++++++++--
1 files changed, 12 insertions(+), 2 deletions(-)
diff --git a/jcdm-main/src/main/resources/mapper/da/paramCollection/DaParamCollectionMapper.xml b/jcdm-main/src/main/resources/mapper/da/paramCollection/DaParamCollectionMapper.xml
index 8699587..bea39b4 100644
--- a/jcdm-main/src/main/resources/mapper/da/paramCollection/DaParamCollectionMapper.xml
+++ b/jcdm-main/src/main/resources/mapper/da/paramCollection/DaParamCollectionMapper.xml
@@ -28,22 +28,25 @@
<result property="paramName" column="param_name" />
<result property="unit" column="unit" />
<result property="type" column="type" />
+ <result property="repairFlag" column="repair_flag" />
</resultMap>
<sql id="selectDaParamCollectionVo">
- select id, work_order_no, sfc_code, product_code, production_line, location_code, equipment_no, param_code, param_value, param_upper, param_lower, param_standard, collection_time, spare_field_1, spare_field_2, create_user, create_time, update_user, update_time, state, param_name, unit, type from da_param_collection
+ select id, work_order_no, sfc_code, product_code, production_line, location_code, equipment_no, param_code, param_value, param_upper, param_lower, param_standard, collection_time, spare_field_1, spare_field_2, create_user, create_time, update_user, update_time, state, param_name, unit, type, repair_flag from da_param_collection
</sql>
<select id="selectDaParamCollectionList" parameterType="DaParamCollection" resultMap="DaParamCollectionResult">
<include refid="selectDaParamCollectionVo"/>
<where>
<if test="workOrderNo != null and workOrderNo != ''"> and work_order_no = #{workOrderNo}</if>
+ <if test="type != null and type != ''"> and type = #{type}</if>
<if test="sfcCode != null and sfcCode != ''"> and sfc_code = #{sfcCode}</if>
<if test="productCode != null and productCode != ''"> and product_code = #{productCode}</if>
<if test="productionLine != null and productionLine != ''"> and production_line = #{productionLine}</if>
<if test="locationCode != null and locationCode != ''"> and location_code = #{locationCode}</if>
<if test="equipmentNo != null and equipmentNo != ''"> and equipment_no = #{equipmentNo}</if>
<if test="paramCode != null and paramCode != ''"> and param_code = #{paramCode}</if>
+ <if test="dateConditions != null and dateConditions != ''"> and collection_time BETWEEN #{startTime} AND #{endTime}</if>
</where>
</select>
@@ -51,7 +54,14 @@
<include refid="selectDaParamCollectionVo"/>
where id = #{id}
</select>
-
+ <select id="getListBySfcCode" resultMap="DaParamCollectionResult">
+ <include refid="selectDaParamCollectionVo"/>
+ where sfc_code in
+ <foreach collection="engineNoList" open="(" close=")" item="code" separator=",">
+ #{code}
+ </foreach>
+ </select>
+
<insert id="insertDaParamCollection" parameterType="DaParamCollection">
insert into da_param_collection
<trim prefix="(" suffix=")" suffixOverrides=",">
--
Gitblit v1.9.3