Merge remote-tracking branch 'origin/master'

jobs/task-step01.yaml

@@ -103,6 +103,14 @@ job:
             source: winhc_eci.inc_ods_zxr_evaluate_pre
             target: winhc_eci_dev.inc_ods_zxr_evaluate
             flag: 1
+      #限制出境增量合并
+      - taskName: inc_ods_restrictions_on_exit_pre
+        param:
+          - _nodeId: 700003517752
+            project: winhc_eci_dev
+            source: winhc_eci.inc_ods_restrictions_on_exit_pre
+            target: winhc_eci_dev.inc_ods_restrictions_on_exit
+            flag: 1
 
       #限制高消费
       - taskName: inc_ods_company_zxr_restrict_pre

jobs/task-step02.yaml

@@ -86,6 +86,18 @@ job:
             tableName: zxr_evaluate_results
             cidField: new_cid
             dupliCols: new_cid,name,case_no,asset_name,publish_time
+      - taskName: restrictions_on_exit
+        param:
+          - _nodeId: 700003375026
+            project: winhc_eci_dev
+            tableName: restrictions_on_exit
+            dupliCols: new_cid,case_no,limited_person,executed_person
+            flag: cid
+          - _nodeId: 700003380225
+            project: winhc_eci_dev
+            tableName: restrictions_on_exit
+            cidField: new_cid
+            dupliCols: new_cid,case_no,limited_person,executed_person
       - taskName: company_dishonest_info
         param:
           - _nodeId: 700003375026
@@ -386,18 +398,6 @@ job:
             cidField: new_cid
             dupliCols: new_cid,court,start_date,title
   #------>
-  #------<年报-对外担保:Spark
-  - project: winhc_test
-    flow: incr_calc_intellectual_without_md5
-    task:
-      - taskName: company_annual_report_out_guarantee
-        param:
-          - _nodeId: 700003483308
-            project: winhc_eci_dev
-            tableName: company_annual_report_out_guarantee
-            dupliCols: new_cid,id
-            flag: cid
-  #------>
   #------<限制消费令(企业）:Spark
   - project: winhc_test
     flow: incr_calc_intellectual

src/main/java/com/winhc/dataworks/flow/touch/Main.java

@@ -150,7 +150,7 @@ public class Main {
                 } else {
                     String odpsCmdPath = commandLine.getOptionValue("odps");
                     dd.send(msg);
-                    Long time = 120L;
+                    Long time = 330L;
                     if (fileName.endsWith("step06.yaml")) {
                         time = 60 * 6L;
                     }