冲突解决

src/main/resources/mapper/dmp/DmpDevelopTaskMapper.xml

@@ -73,9 +73,9 @@
 
     <!--新增所有列-->
     <insert id="insert" keyProperty="id" useGeneratedKeys="true">
-        insert into dmp_develop_task(datasource_id, TASK_TYPE, TYPE, SCHEDULE_TYPE, IS_SUBMIT, TASK_DESC, SCRIPT, DATA_STATUS, CREATE_USER_ID, CREATE_TIME,
+        insert into dmp_develop_task(datasource_id, TASK_TYPE, TYPE, SCHEDULE_TYPE, IS_SUBMIT, TASK_DESC, SCRIPT, DATA_STATUS, CREATE_USER_ID, CREATE_TIME, SOURCE_DB_ID,
         UPDATE_USER_ID, UPDATE_TIME, TREE_ID, CHK_RESULT, SYNC_RESULT, CHK_TIME, SYNC_TIME, FLOW_HEADER, FLOW_JSON, VERSION, publish_version, IS_GZIPED,SOURCE_DB_NAME,SOURCE_TABLE_NAME,TARGET_DB_NAME,TARGET_TABLE_NAME)
-        values (#{datasourceId}, #{taskType}, #{type}, #{scheduleType}, #{isSubmit}, #{taskDesc}, #{data}, #{dataStatus}, #{createUserId}, #{createTime}, #{updateUserId},
+        values (#{datasourceId}, #{taskType}, #{type}, #{scheduleType}, #{isSubmit}, #{taskDesc}, #{script}, #{dataStatus}, #{createUserId}, #{createTime}, #{sourceDbId}, #{updateUserId},
         #{updateTime}, #{treeId}, #{chkResult}, #{syncResult}, #{chkTime}, #{syncTime}, #{flowHeader}, #{flowJson}, #{version}, #{publishVersion,jdbcType=VARCHAR}, #{isGziped}, #{sourceDbName}, #{sourceTableName}, #{targetDbName}, #{targetTableName})
     </insert>
 
@@ -148,6 +148,21 @@
             <if test="isGziped != null">
                 IS_GZIPED = #{isGziped},
             </if>
+            <if test="sourceDbId != null">
+                source_db_id = #{sourceDbId},
+            </if>
+            <if test="sourceDbName != null and sourceTableName != '' ">
+                source_db_name = #{sourceDbName},
+            </if>
+            <if test="sourceTableName != null and sourceTableName !='' ">
+                source_table_name = #{sourceTableName},
+            </if>
+            <if test="targetDbName != null and targetDbName !='' ">
+                target_db_name = #{targetDbName},
+            </if>
+            <if test="targetTableName != null and targetTableName !='' ">
+                target_table_name = #{targetTableName},
+            </if>
         </set>
         where ID = #{id}
     </update>