Merge remote-tracking branch 'origin/master'

jobs/task-step01.yaml

@@ -9,3 +9,27 @@ job:
           - _nodeId: 700003471556
             PROJECT: winhc_eci_dev
   #------>
+
+  - project: winhc_eci
+    flow: company_judicial_sale
+    task:
+
+      #run-1 司法拍卖前置任务
+      - taskName: company_judicial_sale
+        param:
+          - _nodeId: 700003485951
+            project: winhc_eci_dev
+            tableName: company_judicial_sale
+
+
+
+  - project: winhc_eci
+    flow: wenshu_detail_combine
+    task:
+
+      #run-1 文书前置任务
+      - taskName: wenshu_detail_combine
+        param:
+          - _nodeId: 700003495086
+            project: winhc_eci_dev
+            tableName: wenshu_detail_combine

jobs/task-step02.yaml

@@ -319,6 +319,44 @@ job:
             dupliCols: new_cid,case_no
             flag: cid
             updateCol: case_create_time
+  #------<简易注销:Spark
+  - project: winhc_test
+    flow: incr_calc_intellectual_without_md5
+    task:
+      - taskName: company_brief_cancel_announcement
+        param:
+          - _nodeId: 700003483308
+            project: winhc_eci_dev
+            tableName: company_brief_cancel_announcement
+            dupliCols: new_cid,id
+            flag: cid
+  #------>
+  #------<简易注销-结果:Spark
+      - taskName: company_brief_cancel_announcement_result
+        param:
+          - _nodeId: 700003483308
+            project: winhc_eci_dev
+            tableName: company_brief_cancel_announcement_result
+            dupliCols: new_cid,main_id,id
+            flag: cid
+  #------>
+  #------<简易注销-异议:Spark
+      - taskName: company_brief_cancel_announcement_objection
+        param:
+          - _nodeId: 700003483308
+            project: winhc_eci_dev
+            tableName: company_brief_cancel_announcement_objection
+            dupliCols: new_cid,main_id,id
+            flag: cid
+  #------>
+  #------<清算信息:Spark
+      - taskName: company_liquidating_info
+        param:
+          - _nodeId: 700003483308
+            project: winhc_eci_dev
+            tableName: company_liquidating_info
+            dupliCols: new_cid,id
+            flag: cid
   #------>
   - project: winhc_test
     flow: inc_company_mapping
@@ -477,4 +515,188 @@ job:
             cidField: new_cid
             dupliCols: new_cid,reg_num
 
+  - project: winhc_test
+    flow: incr_calc_intellectual
+    task:
+
+      #裁判文书
+      - taskName: wenshu_detail_combine
+        param:
+          - _nodeId: 700003375026
+            project: winhc_eci_dev
+            tableName: wenshu_detail_combine
+            dupliCols: new_cid,case_no,cname
+            flag: cid
+          - _nodeId: 700003380225
+            project: winhc_eci_dev
+            tableName: wenshu_detail_combine
+            cidField: new_cid
+            dupliCols: new_cid,case_no,cname
+
+      #行政许可
+      - taskName: company_license
+        param:
+          - _nodeId: 700003375026
+            project: winhc_eci_dev
+            tableName: company_license
+            dupliCols: new_cid,license_number
+            flag: cid
+          - _nodeId: 700003380225
+            project: winhc_eci_dev
+            tableName: company_license
+            cidField: new_cid
+            dupliCols: new_cid,license_number
+
+      #行政许可-企业公示
+      - taskName: company_license_entpub
+        param:
+          - _nodeId: 700003375026
+            project: winhc_eci_dev
+            tableName: company_license_entpub
+            dupliCols: new_cid,license_number
+            flag: cid
+          - _nodeId: 700003380225
+            project: winhc_eci_dev
+            tableName: company_license_entpub
+            cidField: new_cid
+            dupliCols: new_cid,license_number
+
+      #行政许可-信用中国
+      - taskName: company_license_creditchina
+        param:
+          - _nodeId: 700003375026
+            project: winhc_eci_dev
+            tableName: company_license_creditchina
+            dupliCols: new_cid,licence_number
+            flag: cid
+          - _nodeId: 700003380225
+            project: winhc_eci_dev
+            tableName: company_license_creditchina
+            cidField: new_cid
+            dupliCols: new_cid,licence_number
+
+      #终本案件
+      - taskName: company_zxr_final_case
+        param:
+          - _nodeId: 700003375026
+            project: winhc_eci_dev
+            tableName: company_zxr_final_case
+            dupliCols: new_cid,case_no
+            flag: cid
+          - _nodeId: 700003380225
+            project: winhc_eci_dev
+            tableName: company_zxr_final_case
+            cidField: new_cid
+            dupliCols: new_cid,case_no
+
+      #司法拍卖
+      - taskName: company_judicial_sale_combine
+        param:
+          - _nodeId: 700003375026
+            project: winhc_eci_dev
+            tableName: company_judicial_sale_combine
+            dupliCols: new_cid,main_id
+            flag: cids
+          - _nodeId: 700003380225
+            project: winhc_eci_dev
+            tableName: company_judicial_sale_combine_list
+            cidField: new_cid
+            dupliCols: new_cid,main_id
+
+      #双随机抽查-结果公示
+      - taskName: company_double_random_check_result_info
+        param:
+          - _nodeId: 700003375026
+            project: winhc_eci_dev
+            tableName: company_double_random_check_result_info
+            dupliCols: new_cid,main_id,check_item
+            flag: cid
+          - _nodeId: 700003380225
+            project: winhc_eci_dev
+            tableName: company_double_random_check_result_info
+            cidField: new_cid
+            dupliCols: new_cid,main_id,check_item
+
+      #双随机抽查
+      - taskName: company_double_random_check_info
+        param:
+          - _nodeId: 700003375026
+            project: winhc_eci_dev
+            tableName: company_double_random_check_info
+            dupliCols: new_cid,check_task_num
+            flag: cid
+          - _nodeId: 700003380225
+            project: winhc_eci_dev
+            tableName: company_double_random_check_info
+            cidField: new_cid
+            dupliCols: new_cid,check_task_num
 
+      #抽查检查
+      - taskName: company_check_info
+        param:
+          - _nodeId: 700003375026
+            project: winhc_eci_dev
+            tableName: company_check_info
+            dupliCols: new_cid,check_org,check_date
+            flag: cid
+          - _nodeId: 700003380225
+            project: winhc_eci_dev
+            tableName: company_check_info
+            cidField: new_cid
+            dupliCols: new_cid,check_org,check_date
+
+      #税收违法
+      - taskName: company_tax_contravention
+        param:
+          - _nodeId: 700003375026
+            project: winhc_eci_dev
+            tableName: company_tax_contravention
+            dupliCols: new_cid,taxpayer_number,case_info
+            flag: cid
+          - _nodeId: 700003380225
+            project: winhc_eci_dev
+            tableName: company_tax_contravention
+            cidField: new_cid
+            dupliCols: new_cid,taxpayer_number,case_info
+
+      #法院公告
+      - taskName: company_court_announcement
+        param:
+          - _nodeId: 700003375026
+            project: winhc_eci_dev
+            tableName: company_court_announcement
+            dupliCols: new_cid,plaintiff,litigant,publish_date,case_no
+            flag: cids
+          - _nodeId: 700003380225
+            project: winhc_eci_dev
+            tableName: company_court_announcement_list
+            cidField: new_cid
+            dupliCols: new_cid,plaintiff,litigant,publish_date,case_no
+
+      #立案信息
+      - taskName: company_court_register
+        param:
+          - _nodeId: 700003375026
+            project: winhc_eci_dev
+            tableName: company_court_register
+            dupliCols: new_cid,case_no,plaintiff,defendant
+            flag: cids
+          - _nodeId: 700003380225
+            project: winhc_eci_dev
+            tableName: company_court_register_list
+            cidField: new_cid
+            dupliCols: new_cid,case_no,plaintiff,defendant
+
+      #开庭公告
+      - taskName: company_court_open_announcement
+        param:
+          - _nodeId: 700003375026
+            project: winhc_eci_dev
+            tableName: company_court_open_announcement
+            dupliCols: new_cid,case_no,plaintiff,defendant
+            flag: cids
+          - _nodeId: 700003380225
+            project: winhc_eci_dev
+            tableName: company_court_open_announcement_list
+            cidField: new_cid
+            dupliCols: new_cid,case_no,plaintiff,defendant

src/main/resources/task-step02.yaml

@@ -356,5 +356,3 @@ job:
             tableName: company_copyright_works_list
             cidField: new_cid
             dupliCols: new_cid,reg_num
-
-