feat: 土地转让和土地抵押摘要计算区分开

src/main/scala/com/winhc/bigdata/spark/utils/CompanyIncSummary.scala

@@ -44,7 +44,7 @@ case class CompanyIncSummary(s: SparkSession,
           ))
         ).calc()
       }
-      case "company_zxr_list"=>{
+      case "company_zxr_list" => {
         CompanySummaryPro(s = spark
           , project = "winhc_eci_dev"
           , tableName = "company_zxr_list"
@@ -52,11 +52,11 @@ case class CompanyIncSummary(s: SparkSession,
           , where = "deleted = 0"
           , groupByInfo = GroupByInfo(field = "status", value_alias = Seq(
             ("0", "company_zxr_list_0")
-            ,("1", "company_zxr_list_1")
+            , ("1", "company_zxr_list_1")
           ))
         ).calc()
       }
-      case "company_zxr_restrict"=>{
+      case "company_zxr_restrict" => {
         CompanySummaryPro(s = spark
           , project = "winhc_eci_dev"
           , tableName = "company_zxr_restrict"
@@ -64,10 +64,44 @@ case class CompanyIncSummary(s: SparkSession,
           , where = "deleted = 0"
           , groupByInfo = GroupByInfo(field = "status", value_alias = Seq(
             ("0", "company_zxr_restrict_0")
-            ,("1", "company_zxr_restrict_1")
+            , ("1", "company_zxr_restrict_1")
           ))
         ).calc()
       }
+      case "company_land_mortgage" => {
+        //土地抵押
+        CompanySummaryPro(s = spark
+          , project = "winhc_eci_dev"
+          , tableName = "company_land_mortgage"
+          , cidField = "split(rowkey,'_')[0]"
+//          , where = "deleted = 0"
+          , groupByInfo = GroupByInfo(field = "type", value_alias = Seq(
+            ("mortgagor", "company_land_mortgage_mortgagor")
+            , ("mortgagee", "company_land_mortgage_mortgagee")
+            , ("bothsame", "company_land_mortgage_bothsame")
+            , ("bothone", "company_land_mortgage_bothone")
+            , ("bothtwo", "company_land_mortgage_bothtwo")
+          ))
+        ).calc()
+      }
+
+      case "company_land_transfer" => {
+        //土地转让
+        CompanySummaryPro(s = spark
+          , project = "winhc_eci_dev"
+          , tableName = "company_land_transfer"
+          , cidField = "split(rowkey,'_')[0]"
+          //          , where = "deleted = 0"
+          , groupByInfo = GroupByInfo(field = "type", value_alias = Seq(
+            ("pre", "company_land_transfer_pre")
+            , ("now", "company_land_transfer_now")
+            , ("bothsame", "company_land_transfer_bothsame")
+            , ("bothone", "company_land_transfer_bothone")
+            , ("bothtwo", "company_land_transfer_bothtwo")
+          ))
+        ).calc()
+      }
+
       case _ => {
         my_calc()
       }