Browse Source

fix: 企业摘要

许家凯 3 years ago
parent
commit
9c8c5cab71

+ 4 - 4
src/main/scala/com/winhc/bigdata/spark/ng/utils/CompanySummaryNg_new.scala

@@ -421,7 +421,7 @@ object CompanySummaryNg_new {
       , where = "litigant_info_id_explode is not null and length(litigant_info_id_explode) = 32 "
       , groupByInfo = GroupByInfoNg(field = "deleted", value_alias = Seq(
         ("0", s"company_court_announcement_del_0_litigant")
-        , ("1", s"company_court_announcement_1_litigant")
+        , ("1", s"company_court_announcement_del_1_litigant")
       ))
     )
     , company_summary_args(table_name = "company_send_announcement_explode"
@@ -430,7 +430,7 @@ object CompanySummaryNg_new {
       , where = "plaintiff_info_id_explode is not null and length(plaintiff_info_id_explode) = 32 "
       , groupByInfo = GroupByInfoNg(field = "deleted", value_alias = Seq(
         ("0", s"company_send_announcement_del_0_plaintiff")
-        , ("1", s"company_send_announcement_1_plaintiff")
+        , ("1", s"company_send_announcement_del_1_plaintiff")
       ))
     )
     , company_summary_args(table_name = "company_send_announcement_explode"
@@ -439,7 +439,7 @@ object CompanySummaryNg_new {
       , where = "defendant_info_id_explode is not null and length(defendant_info_id_explode) = 32 "
       , groupByInfo = GroupByInfoNg(field = "deleted", value_alias = Seq(
         ("0", s"company_send_announcement_del_0_defendant")
-        , ("1", s"company_send_announcement_1_defendant")
+        , ("1", s"company_send_announcement_del_1_defendant")
       ))
     ), company_summary_args(table_name = "company_zxr_final_case"
       , companyIdField = "keyno"
@@ -528,7 +528,7 @@ object CompanySummaryNg_new {
     )
 
     val spark = SparkUtils.InitEnv(getClass.getSimpleName, config)
-    PersonSummaryNg_new(s = spark, project = "winhc_ng", args = start_args).calc()
+    CompanySummaryNg_new(s = spark, project = "winhc_ng", args = start_args).calc()
     spark.stop()
   }
 }

+ 1 - 1
src/main/scala/com/winhc/bigdata/spark/ng/utils/merge_table.scala

@@ -19,7 +19,7 @@ case class merge_table(s: SparkSession,
                        join_key: String
                       ) extends LoggingUtils with BaseFunc {
   @(transient@getter) val spark: SparkSession = s
-  private val tmp_tab_prefix = "winhc_ng.tmp_p_"
+  private val tmp_tab_prefix = "winhc_ng.tmp_"
 
 
   private def init(): Unit = {