From d3409e53d656dff668c12a335bcb6f367ca63fdb Mon Sep 17 00:00:00 2001 From: 懒羊羊 <15939171744@163.com> Date: 星期四, 25 一月 2024 09:03:10 +0800 Subject: [PATCH] opcua迁移 --- jcdm-main/src/main/resources/mapper/da/paramCollection/DaParamCollectionMapper.xml | 24 ++---------------------- 1 files changed, 2 insertions(+), 22 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 43adf79..f8bfd29 100644 --- a/jcdm-main/src/main/resources/mapper/da/paramCollection/DaParamCollectionMapper.xml +++ b/jcdm-main/src/main/resources/mapper/da/paramCollection/DaParamCollectionMapper.xml @@ -28,27 +28,19 @@ <result property="paramName" column="param_name" /> <result property="unit" column="unit" /> <result property="type" column="type" /> - <result property="parameterSetCode" column="parameter_set_code" /> - <result property="parameterSetName" column="parameter_set_name" /> - <result property="processesCode" column="processes_code" /> - <result property="processesName" column="processes_name" /> - </resultMap> <sql id="selectDaParamCollectionVo"> - select id, work_order_no, sfc_code,processes_name,processes_code, parameter_set_code ,parameter_set_name, 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 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="parameterSetCode != null and parameterSetCode != ''"> and parameter_set_code = #{parameterSetCode}</if> - <if test="parameterSetName != null and parameterSetName != ''"> and parameter_set_name = #{parameterSetName}</if> - <if test="processesCode != null and processesCode != ''"> and processes_code = #{processesCode}</if> - <if test="processesName != null and processesName != ''"> and processes_name = #{processesName}</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> @@ -70,10 +62,6 @@ <if test="productCode != null and productCode != ''">product_code,</if> <if test="productionLine != null and productionLine != ''">production_line,</if> <if test="locationCode != null and locationCode != ''">location_code,</if> - <if test="parameterSetCode != null and parameterSetCode != ''">parameter_set_code,</if> - <if test="parameterSetName != null and parameterSetName != ''">parameter_set_name,</if> - <if test="processesCode != null and processesCode != ''">processes_code,</if> - <if test="processesName != null and processesName != ''">processes_name,</if> <if test="equipmentNo != null">equipment_no,</if> <if test="paramCode != null and paramCode != ''">param_code,</if> <if test="paramValue != null and paramValue != ''">param_value,</if> @@ -99,10 +87,6 @@ <if test="productCode != null and productCode != ''">#{productCode},</if> <if test="productionLine != null and productionLine != ''">#{productionLine},</if> <if test="locationCode != null and locationCode != ''">#{locationCode},</if> - <if test="parameterSetCode != null and parameterSetCode != ''">#{parameter_set_code},</if> - <if test="parameterSetName != null and parameterSetName != ''">#{parameter_set_name},</if> - <if test="processesCode != null and processesCode != ''">#{processes_code},</if> - <if test="processesName != null and processesName != ''">#{processes_name},</if> <if test="equipmentNo != null">#{equipmentNo},</if> <if test="paramCode != null and paramCode != ''">#{paramCode},</if> <if test="paramValue != null and paramValue != ''">#{paramValue},</if> @@ -131,10 +115,6 @@ <if test="productCode != null and productCode != ''">product_code = #{productCode},</if> <if test="productionLine != null and productionLine != ''">production_line = #{productionLine},</if> <if test="locationCode != null and locationCode != ''">location_code = #{locationCode},</if> - <if test="parameterSetCode != null and parameterSetCode != ''">parameter_set_code = #{parameterSetCode},</if> - <if test="parameterSetName != null and parameterSetName != ''">parameter_set_name = #{parameterSetName},</if> - <if test="processesCode != null and processesCode != ''">processes_code = #{processesCode},</if> - <if test="processesName != null and processesName != ''">processes_name = #{processesName},</if> <if test="equipmentNo != null">equipment_no = #{equipmentNo},</if> <if test="paramCode != null and paramCode != ''">param_code = #{paramCode},</if> <if test="paramValue != null and paramValue != ''">param_value = #{paramValue},</if> -- Gitblit v1.9.3