Explorar o código

feat: 摘要替换新方法

许家凯 %!s(int64=4) %!d(string=hai) anos
pai
achega
ed42b73206

+ 7 - 2
src/main/scala/com/winhc/bigdata/spark/utils/CompanyIncSummary.scala

@@ -74,7 +74,7 @@ case class CompanyIncSummary(s: SparkSession,
           , project = "winhc_eci_dev"
           , tableName = "company_land_mortgage"
           , cidField = "split(rowkey,'_')[0]"
-//          , where = "deleted = 0"
+          //          , where = "deleted = 0"
           , groupByInfo = GroupByInfo(field = "type", value_alias = Seq(
             ("mortgagor", "company_land_mortgage_mortgagor")
             , ("mortgagee", "company_land_mortgage_mortgagee")
@@ -103,7 +103,12 @@ case class CompanyIncSummary(s: SparkSession,
       }
 
       case _ => {
-        my_calc()
+        CompanySummaryPro(s = spark
+          , project = "winhc_eci_dev"
+          , tableName = tableName
+          , cidField = "split(rowkey,'_')[0]"
+        ).calc()
+        //        my_calc()
       }
     }
   }

+ 1 - 7
src/main/scala/com/winhc/bigdata/spark/utils/CompanySummaryPro.scala

@@ -245,14 +245,8 @@ object CompanySummaryPro {
     val spark = SparkUtils.InitEnv(getClass.getSimpleName, config)
     CompanySummaryPro(s = spark
       , project = "winhc_eci_dev"
-      , tableName = "company_equity_info_list"
+      , tableName = "company_env_punishment"
       , cidField = "split(rowkey,'_')[0]"
-      , groupByInfo = GroupByInfo(field = "type", value_alias = Seq(
-        ("0", "company_equity_info_list_0")
-        , ("1", "company_equity_info_list_1")
-        , ("2", "company_equity_info_list_2")
-      ))
-      , where = "deleted = 0"
     )
       .calc(is_inc = false, target_tab = "winhc_eci_dev.xjk_tmp_summary")