fix: 企业动态提取fix bugs

src/main/scala/com/winhc/bigdata/spark/jobs/dynamic/CompanyDynamic.scala

@@ -186,7 +186,7 @@ object CompanyDynamic {
     , Args(tableName = "company_land_publicity", bName = 1)
     , Args(tableName = "company_employment", bName = 1)
     , Args(tableName = "company_land_announcement", bName = 1)
-    , Args(tableName = "company_bid_list", bName = 1)
+    , Args(tableName = "company_bid_list", bName = 2)
     , Args(tableName = "company_land_transfer", bName = 1)
     , Args(tableName = "company_env_punishment", bName = 1)
     , Args(tableName = "company_punishment_info", bName = 1)
@@ -203,18 +203,18 @@ object CompanyDynamic {
     , Args(tableName = "company_brief_cancel_announcement", bName = 1)
     , Args(tableName = "company_liquidating_info", bName = 1)
 
-    , Args(tableName = "company_zxr_final_case", bName = 1)//终本案件
-    , Args(tableName = "company_license_creditchina", bName = 1)//行政许可-信用中国
-    , Args(tableName = "company_license_entpub", bName = 1)//行政许可-企业公示
-    , Args(tableName = "company_license", bName = 1)//行政许可
-    , Args(tableName = "company_check_info", bName = 1)//抽查检查
-    , Args(tableName = "company_court_announcement_list", bName = 1)//法院公告
-    , Args(tableName = "company_court_open_announcement_list", bName = 1)//开庭公告
-    , Args(tableName = "company_court_register_list", bName = 1)//立案信息
-    , Args(tableName = "company_double_random_check_info", bName = 1)//双随机抽查
-    , Args(tableName = "company_judicial_sale_combine_list", bName = 1)//司法拍卖
-    , Args(tableName = "company_tax_contravention", bName = 1)//税收违法
-    , Args(tableName = "wenshu_detail_combine", bName = 1)//裁判文书
+    , Args(tableName = "company_zxr_final_case", bName = 1) //终本案件
+    , Args(tableName = "company_license_creditchina", bName = 1) //行政许可-信用中国
+    , Args(tableName = "company_license_entpub", bName = 1) //行政许可-企业公示
+    , Args(tableName = "company_license", bName = 1) //行政许可
+    , Args(tableName = "company_check_info", bName = 1) //抽查检查
+    , Args(tableName = "company_court_announcement_list", bName = 1) //法院公告
+    , Args(tableName = "company_court_open_announcement_list", bName = 1) //开庭公告
+    , Args(tableName = "company_court_register_list", bName = 1) //立案信息
+    , Args(tableName = "company_double_random_check_info", bName = 1) //双随机抽查
+    , Args(tableName = "company_judicial_sale_combine_list", bName = 1) //司法拍卖
+    , Args(tableName = "company_tax_contravention", bName = 1) //税收违法
+    , Args(tableName = "wenshu_detail_combine", bName = 1) //裁判文书
   )
 
   private case class Args(project: String = "winhc_eci_dev"
@@ -228,7 +228,7 @@ object CompanyDynamic {
       println(
         s"""
            |Please enter the legal parameters !
-           |<project> <ds> <tableNames>
+           |<project> <tableNames> <ds>
            |""".stripMargin)
       sys.exit(-99)
     }
@@ -250,13 +250,20 @@ object CompanyDynamic {
     val cd = CompanyDynamicUtil(spark, project, ds)
     cd.init()
 
-    val ts = tableNames.split(",").toSet
+    if (tableNames.equals("all")) {
+      startArgs.foreach(e => {
+        cd.calc(e.tableName, e.bName)
+      })
+    } else {
+      val ts = tableNames.split(",").toSet
+
+      startArgs.filter(e => {
+        ts.contains(e.tableName)
+      }).foreach(e => {
+        cd.calc(e.tableName, e.bName)
+      })
+    }
 
-    startArgs.filter(e => {
-      ts.contains(e.tableName)
-    }).foreach(e => {
-      cd.calc(e.tableName, e.bName)
-    })
     spark.stop()
   }
 }

src/main/scala/com/winhc/bigdata/spark/jobs/dynamic/CompanyDynamicHandle.scala

@@ -31,7 +31,7 @@ trait CompanyDynamicHandle {
     , "company_env_punishment" -> "env_punishment" //环保处罚
     , "" -> "judicial_assistance" //股权冻结
     , "company_public_announcement2_list" -> "company_public_announcement2_list" //公示催告
-    , "" -> "serious_violation" //严重违法
+    , "company_illegal_info" -> "serious_violation" //严重违法
     , "company_brief_cancel_announcement" -> "company_brief_cancel_announcement" //简易注销
     , "company_equity_info" -> "stock_pledge" //股权出质
     , "company_tax_contravention" -> "tax_illegal" //税收违法
@@ -82,7 +82,7 @@ trait CompanyDynamicHandle {
     , "company_public_announcement2_list" -> "15" // 公示催告
     , "company_env_punishment" -> "16" // 环保处罚
     , "company_equity_info" -> "17" // 股权出质
-    , "" -> "18" // 严重违法
+    , "company_illegal_info" -> "18" // 严重违法
     , "company_brief_cancel_announcement" -> "19" // 简易注销
     , "company_own_tax" -> "20" // 欠税公告
     , "company_tax_contravention" -> "21" // 税收违法
@@ -120,7 +120,7 @@ trait CompanyDynamicHandle {
     , "" -> "4" //司法拍卖
     , "company_liquidating_info" -> "4" //清算信息
     , "company_brief_cancel_announcement" -> "4" //简易注销
-    , "" -> "4" //严重违法
+    , "company_illegal_info" -> "4" //严重违法
     , "" -> "3" //裁判文书（被告）
     , "" -> "3" //裁判文书（被执行人）
     , "" -> "3" //法院公告（被告/被执行人）