From 6d313a4a6f9f9d7ea65ec50ab0d4491e595edb97 Mon Sep 17 00:00:00 2001
From: admin <15939171744@163.com>
Date: 星期二, 15 十月 2024 09:47:26 +0800
Subject: [PATCH] -打印bug修改
---
jcdm-main/src/main/resources/mapper/da/collectionParamConf/DaCollectionParamConfMapper.xml | 40 +++++++++++++++++++++++++---------------
1 files changed, 25 insertions(+), 15 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..abeb704 100644
--- a/jcdm-main/src/main/resources/mapper/da/collectionParamConf/DaCollectionParamConfMapper.xml
+++ b/jcdm-main/src/main/resources/mapper/da/collectionParamConf/DaCollectionParamConfMapper.xml
@@ -26,10 +26,10 @@
<result property="createTime" column="create_time" />
<result property="updateUser" column="update_user" />
<result property="updateTime" column="update_time" />
- <result property="spareField1" column="spare_field_1" />
- <result property="spareField2" column="spare_field_2" />
- <result property="spareField3" column="spare_field_3" />
- <result property="spareField4" column="spare_field_4" />
+ <result property="spareField1" column="spare_field1" />
+ <result property="spareField2" column="spare_field2" />
+ <result property="spareField3" column="spare_field3" />
+ <result property="spareField4" column="spare_field4" />
<result property="processesName" column="processes_name" />
<result property="device" column="device" />
<result property="project" column="project" />
@@ -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_field1, spare_field2, spare_field3, spare_field4, 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>
@@ -88,10 +92,10 @@
<if test="createTime != null">create_time,</if>
<if test="updateUser != null">update_user,</if>
<if test="updateTime != null">update_time,</if>
- <if test="spareField1 != null">spare_field_1,</if>
- <if test="spareField2 != null">spare_field_2,</if>
- <if test="spareField3 != null">spare_field_3,</if>
- <if test="spareField4 != null">spare_field_4,</if>
+ <if test="spareField1 != null">spare_field1,</if>
+ <if test="spareField2 != null">spare_field2,</if>
+ <if test="spareField3 != null">spare_field3,</if>
+ <if test="spareField4 != null">spare_field4,</if>
<if test="processesName != null">processes_name,</if>
<if test="device != null">device,</if>
<if test="project != null">project,</if>
@@ -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">
@@ -163,10 +171,10 @@
<if test="createTime != null">create_time = #{createTime},</if>
<if test="updateUser != null">update_user = #{updateUser},</if>
<if test="updateTime != null">update_time = #{updateTime},</if>
- <if test="spareField1 != null">spare_field_1 = #{spareField1},</if>
- <if test="spareField2 != null">spare_field_2 = #{spareField2},</if>
- <if test="spareField3 != null">spare_field_3 = #{spareField3},</if>
- <if test="spareField4 != null">spare_field_4 = #{spareField4},</if>
+ <if test="spareField1 != null">spare_field1 = #{spareField1},</if>
+ <if test="spareField2 != null">spare_field2 = #{spareField2},</if>
+ <if test="spareField3 != null">spare_field3 = #{spareField3},</if>
+ <if test="spareField4 != null">spare_field4 = #{spareField4},</if>
<if test="processesName != null">processes_name = #{processesName},</if>
<if test="device != null">device = #{device},</if>
<if test="project != null">project = #{project},</if>
@@ -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