Merge remote-tracking branch 'origin/master'

jobs/task-step02.yaml

@@ -145,13 +145,13 @@ job:
           - _nodeId: 700003375026
             project: winhc_eci_dev
             tableName: company_env_punishment
-            dupliCols: new_cid,name,source_url,punish_number
+            dupliCols: new_cid,name,punish_number
             flag: cid
           - _nodeId: 700003380225
             project: winhc_eci_dev
-            tableName: company_land_publicity
+            tableName: company_env_punishment
             cidField: new_cid
-            dupliCols: new_cid,title,project_name,source_url
+            dupliCols: new_cid,name,punish_number
       #------>
       #------<购地信息:Spark
       - taskName: company_land_announcement
@@ -159,13 +159,13 @@ job:
           - _nodeId: 700003375026
             project: winhc_eci_dev
             tableName: company_land_announcement
-            dupliCols: new_cid,source_url,e_number,project_name
+            dupliCols: new_cid,e_number,project_name
             flag: cid
           - _nodeId: 700003380225
             project: winhc_eci_dev
             tableName: company_land_announcement
             cidField: new_cid
-            dupliCols: new_cid,source_url,e_number,project_name
+            dupliCols: new_cid,e_number,project_name
       #------>
       #------<地块公示:Spark
       - taskName: company_land_publicity
@@ -173,13 +173,13 @@ job:
           - _nodeId: 700003375026
             project: winhc_eci_dev
             tableName: company_land_publicity
-            dupliCols: new_cid,title,project_name,source_url
+            dupliCols: new_cid,title,project_name
             flag: cid
           - _nodeId: 700003380225
             project: winhc_eci_dev
             tableName: company_land_publicity
             cidField: new_cid
-            dupliCols: new_cid,title,project_name,source_url
+            dupliCols: new_cid,title,project_name
       #------>
       #------<行政处罚-信用中国:SPARK
       - taskName: company_punishment_info_creditchina
@@ -236,8 +236,8 @@ job:
             PROJECT: winhc_eci_dev
             DIM_TABLE: company_land_mortgage
             DIM_COLUMS: type,id,land_mark,land_num,land_aministrative_area,land_loc,land_area,other_item_num,use_right_num,mortgagor,mortgagee,nature,use_for,use_type,area,evaluate_amount,mortgage_amount,source_url,start_date,end_date,create_time,update_time,deleted
-            DUPLI_COLS: new_cid,type,source_url,land_mark,land_num
-            MD5_COLS: type,land_num,land_mark,source_url
+            DUPLI_COLS: new_cid,type,land_mark,land_num
+            MD5_COLS: type,land_mark,land_num
           - _nodeId: 700003422526
             PROJECT: winhc_eci_dev
             DIM_TABLE: company_land_mortgage
@@ -246,7 +246,7 @@ job:
             project: winhc_eci_dev
             tableName: company_land_mortgage
             cidField: new_cid
-            dupliCols: new_cid,type,source_url,land_mark,land_num
+            dupliCols: new_cid,type,land_mark,land_num
   #------>
   #------<土地转让:ODPS SQL
   - project: winhc_test
@@ -262,8 +262,8 @@ job:
             PROJECT: winhc_eci_dev
             DIM_TABLE: company_land_transfer
             DIM_COLUMS: type,id,mark,num,location,aministrative_area,user_pre,user_now,area,use_for,use_type,years_of_use,situation,level,merchandise_type,merchandise_price,merchandise_time,url,create_time,update_time,deleted
-            DUPLI_COLS: new_cid,type,num,location,url
-            MD5_COLS: type,num,location,url
+            DUPLI_COLS: new_cid,type,num,location
+            MD5_COLS: type,num,location
             DS: 20200717
           - _nodeId: 700003421692
             PROJECT: winhc_eci_dev
@@ -273,7 +273,7 @@ job:
             project: winhc_eci_dev
             tableName: company_land_transfer
             cidField: new_cid
-            dupliCols: new_cid,type,num,location,url
+            dupliCols: new_cid,type,num,location
   #------>
   #------<公示催告:Spark
   - project: winhc_test
@@ -354,13 +354,13 @@ job:
           - _nodeId: 700003375026
             project: winhc_eci_dev
             tableName: company_send_announcement
-            dupliCols: new_cid,litigant_cids,start_date,case_no
+            dupliCols: new_cid,court,start_date,title
             flag: cids
           - _nodeId: 700003380225
             project: winhc_eci_dev
             tableName: company_send_announcement_list
             cidField: new_cid
-            dupliCols: new_cid,litigant_cids,start_date,case_no
+            dupliCols: new_cid,court,start_date,title
   #------>
   #------<年报-对外担保:Spark
   - project: winhc_test