许家凯 преди 3 години
родител
ревизия
c35888763a
променени са 1 файла, в които са добавени 14 реда и са изтрити 2 реда
  1. 14 2
      src/main/scala/com/winhc/bigdata/spark/ng/utils/CompanySummaryNg_new.scala

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

@@ -373,8 +373,17 @@ object CompanySummaryNg_new {
       , companyIdField = "company_id"
       , where = "company_id is not null and length(company_id) = 32 "
       , groupByInfo = GroupByInfoNg(field = "deleted", value_alias = Seq(
-        ("0", s"company_judicial_assistance_del_0")
-        , ("1", s"company_judicial_assistance_del_1")
+        ("0", s"company_judicial_assistance_del_0_related")
+        , ("1", s"company_judicial_assistance_del_1_related")
+      ))
+    )
+
+    , company_summary_args(table_name = "company_judicial_assistance"
+      , companyIdField = "executed_person_id"
+      , where = "executed_person_id is not null and length(executed_person_id) = 32 "
+      , groupByInfo = GroupByInfoNg(field = "deleted", value_alias = Seq(
+        ("0", s"company_judicial_assistance_del_0_executed_person")
+        , ("1", s"company_judicial_assistance_del_1_executed_person")
       ))
     )
 
@@ -495,6 +504,9 @@ object CompanySummaryNg_new {
 
     //====================================================
 
+    , get_default_summary_args("zxr_evaluate", "keyno")
+    , get_default_summary_args("zxr_evaluate_results", "keyno")
+    , get_default_summary_args("restrictions_on_exit", "executed_person_keyno")
     , get_default_summary_args("company_zxr", "keyno")
     , get_default_summary_args("company_punishment_info", "company_id")
     , get_default_summary_args("company_tax_contravention", "company_id")