From d76bbaa8a9a70124045dc4c9753e5a868ac4e7d2 Mon Sep 17 00:00:00 2001
From: admin <15939171744@163.com>
Date: 星期五, 21 六月 2024 09:33:38 +0800
Subject: [PATCH] -

---
 jcdm-main/src/main/resources/mapper/da/paramCollection/DaParamCollectionMapper.xml |   14 +++++++-------
 1 files changed, 7 insertions(+), 7 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 f8bfd29..c5616a1 100644
--- a/jcdm-main/src/main/resources/mapper/da/paramCollection/DaParamCollectionMapper.xml
+++ b/jcdm-main/src/main/resources/mapper/da/paramCollection/DaParamCollectionMapper.xml
@@ -18,8 +18,8 @@
         <result property="paramLower"    column="param_lower"    />
         <result property="paramStandard"    column="param_standard"    />
         <result property="collectionTime"    column="collection_time"    />
-        <result property="spareField1"    column="spare_field_1"    />
-        <result property="spareField2"    column="spare_field_2"    />
+        <result property="moduleCode"    column="module_code"    />
+        <result property="spareField2"    column="spare_field2"    />
         <result property="createUser"    column="create_user"    />
         <result property="createTime"    column="create_time"    />
         <result property="updateUser"    column="update_user"    />
@@ -31,7 +31,7 @@
     </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, module_code, spare_field2, 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">
@@ -69,8 +69,8 @@
             <if test="paramLower != null">param_lower,</if>
             <if test="paramStandard != null">param_standard,</if>
             <if test="collectionTime != null">collection_time,</if>
-            <if test="spareField1 != null">spare_field_1,</if>
-            <if test="spareField2 != null">spare_field_2,</if>
+            <if test="moduleCode != null">module_code,</if>
+            <if test="spareField2 != null">spare_field2,</if>
             <if test="createUser != null">create_user,</if>
             <if test="createTime != null">create_time,</if>
             <if test="updateUser != null">update_user,</if>
@@ -94,7 +94,7 @@
             <if test="paramLower != null">#{paramLower},</if>
             <if test="paramStandard != null">#{paramStandard},</if>
             <if test="collectionTime != null">#{collectionTime},</if>
-            <if test="spareField1 != null">#{spareField1},</if>
+            <if test="moduleCode != null">#{moduleCode},</if>
             <if test="spareField2 != null">#{spareField2},</if>
             <if test="createUser != null">#{createUser},</if>
             <if test="createTime != null">#{createTime},</if>
@@ -122,7 +122,7 @@
             <if test="paramLower != null">param_lower = #{paramLower},</if>
             <if test="paramStandard != null">param_standard = #{paramStandard},</if>
             <if test="collectionTime != null">collection_time = #{collectionTime},</if>
-            <if test="spareField1 != null">spare_field_1 = #{spareField1},</if>
+            <if test="moduleCode != null">spare_field_1 = #{moduleCode},</if>
             <if test="spareField2 != null">spare_field_2 = #{spareField2},</if>
             <if test="createUser != null">create_user = #{createUser},</if>
             <if test="createTime != null">create_time = #{createTime},</if>

--
Gitblit v1.9.3