Parcourir la source

增加股权抵押摘要

xufei il y a 3 ans
Parent
commit
54d41f1858

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

@@ -39,7 +39,7 @@ object CompanySummaryNg_new {
     get_default_summary_args("company_holder")
     , get_default_summary_args("company_staff")
     , get_default_summary_args("company_icp")
-    , get_default_summary_args("company_tm",company_id = "keyno")
+    , get_default_summary_args("company_tm", company_id = "keyno")
     , get_default_summary_args("company_app_info")
     , get_default_summary_args("finance_info_v3", "company_id")
     , get_default_summary_args("private_enterprise", "company_id")
@@ -48,7 +48,7 @@ object CompanySummaryNg_new {
     , get_default_summary_args("company_env_punishment", "company_id")
     , get_default_summary_args("company_liquidating_info", "company_id")
     , get_default_summary_args("company_certificate", "company_id")
-//    , get_default_summary_args("company_icp", "company_id")
+    //    , get_default_summary_args("company_icp", "company_id")
     , get_default_summary_args("company_weibo", "company_id")
     , get_default_summary_args("company_customs_credit", "company_id")
     , get_default_summary_args("company_license", "company_id")
@@ -388,7 +388,6 @@ object CompanySummaryNg_new {
     )
 
 
-
     , SummaryArgs(table_name = "company_land_transfer"
       , companyIdField = "pre_keyno"
       , where = "pre_keyno is not null and length(pre_keyno) = 32 "
@@ -435,7 +434,14 @@ object CompanySummaryNg_new {
         , ("1", s"company_equity_pledge_holder_del_1_pledgee")
       ))
     )
-
+    , SummaryArgs(table_name = "finance_info_v3"
+      , companyIdField = "company_id"
+      , where = "vendinc_dis = '1' "
+      , groupByInfo = GroupByInfoNg(field = "vendinc_dis", value_alias = Seq(
+        ("1", s"finance_info_v3_dis_1")
+        , ("0", s"finance_info_v3_dis_0")
+      ))
+    )
   )
 
 

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

@@ -18,6 +18,6 @@ case class SummaryArgs(table_name: String
                        , sortField: String = "ds"
                       ) {
   def winhc_hash(): String = {
-    BaseUtil.cleanup(s"${table_name}_${companyIdField}").replaceAll("[\\(\\)() ]", "")
+    BaseUtil.cleanup(s"${table_name}_${companyIdField}_${BaseUtil.MD5hash(where)}").replaceAll("[\\(\\)() ]", "")
   }
 }