From 1df825000b911e5f7b1ad33fc6d0de95793f071a Mon Sep 17 00:00:00 2001 From: 懒羊羊 <15939171744@163.com> Date: 星期四, 28 三月 2024 16:10:05 +0800 Subject: [PATCH] - --- jcdm-main/src/main/resources/mapper/da/collectionParamConf/DaCollectionParamConfMapper.xml | 16 +++++++++++++--- 1 files changed, 13 insertions(+), 3 deletions(-) diff --git a/jcdm-main/src/main/resources/mapper/da/collectionParamConf/DaCollectionParamConfMapper.xml b/jcdm-main/src/main/resources/mapper/da/collectionParamConf/DaCollectionParamConfMapper.xml index 351d97a..40659c3 100644 --- a/jcdm-main/src/main/resources/mapper/da/collectionParamConf/DaCollectionParamConfMapper.xml +++ b/jcdm-main/src/main/resources/mapper/da/collectionParamConf/DaCollectionParamConfMapper.xml @@ -39,10 +39,12 @@ <result property="demandDepartment" column="demand_department" /> <result property="whetherToCollect" column="whether_to_collect" /> <result property="defaultValue" column="default_value" /> + <result property="productModel" column="product_model" /> + </resultMap> <sql id="selectDaCollectionParamConfVo"> - select id, processes_code, parameter_set_code, parameter_set_name, collect_parameter_id, collect_parameter_name, contrast_parameter_flag, collect_parameter_type, collect_parameter_unit, Descriptives, param_upper, param_lower, param_Central, product_code, gather_address, gather_sequence, remarks, create_user, create_time, update_user, update_time, spare_field_1, spare_field_2, spare_field_3, spare_field_4, processes_name, device, project, accuracy, array_length, acquisition_frequency, demand_department, whether_to_collect, default_value from da_collection_param_conf + select id, processes_code, product_model, parameter_set_code, parameter_set_name, collect_parameter_id, collect_parameter_name, contrast_parameter_flag, collect_parameter_type, collect_parameter_unit, Descriptives, param_upper, param_lower, param_Central, product_code, gather_address, gather_sequence, remarks, create_user, create_time, update_user, update_time, spare_field_1, spare_field_2, spare_field_3, spare_field_4, processes_name, device, project, accuracy, array_length, acquisition_frequency, demand_department, whether_to_collect, default_value from da_collection_param_conf </sql> <select id="selectDaCollectionParamConfList" parameterType="DaCollectionParamConf" resultMap="DaCollectionParamConfResult"> @@ -56,6 +58,8 @@ <if test="contrastParameterFlag != null and contrastParameterFlag != ''"> and contrast_parameter_flag like concat('%', #{contrastParameterFlag}, '%')</if> <if test="collectParameterType != null and collectParameterType != ''"> and collect_parameter_type like concat('%', #{collectParameterType}, '%')</if> <if test="productCode != null and productCode != ''"> and product_code like concat('%', #{productCode}, '%')</if> + <if test="gatherAddress != null and gatherAddress != ''"> and gather_address like concat('%', #{gatherAddress}, '%')</if> + </where> </select> @@ -101,7 +105,9 @@ <if test="demandDepartment != null">demand_department,</if> <if test="whetherToCollect != null">whether_to_collect,</if> <if test="defaultValue != null">default_value,</if> - </trim> + <if test="productModel != null">product_model,</if> + + </trim> <trim prefix="values (" suffix=")" suffixOverrides=","> <if test="id != null">#{id},</if> <if test="processesCode != null">#{processesCode},</if> @@ -137,7 +143,9 @@ <if test="demandDepartment != null">#{demandDepartment},</if> <if test="whetherToCollect != null">#{whetherToCollect},</if> <if test="defaultValue != null">#{defaultValue},</if> - </trim> + <if test="productModel != null">#{productModel},</if> + + </trim> </insert> <update id="updateDaCollectionParamConf" parameterType="DaCollectionParamConf"> @@ -176,6 +184,8 @@ <if test="demandDepartment != null">demand_department = #{demandDepartment},</if> <if test="whetherToCollect != null">whether_to_collect = #{whetherToCollect},</if> <if test="defaultValue != null">default_value = #{defaultValue},</if> + <if test="productModel != null">product_model = #{productModel},</if> + </trim> where id = #{id} </update> -- Gitblit v1.9.3