Ver código fonte

fix: 加入导出索引字段,修复摘要

许家凯 3 anos atrás
pai
commit
b5a9c955b9

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

@@ -278,7 +278,7 @@ object CompanySummaryNg_new {
     )
   }
 
-  private val start_args = Seq(
+  val start_args = Seq(
     get_default_summary_args("company_holder")
     , get_default_summary_args("company_staff")
     , get_default_summary_args("company_icp")
@@ -445,8 +445,8 @@ object CompanySummaryNg_new {
       , companyIdField = "keyno"
       , where = "keyno is not null and length(keyno) = 32 "
       , groupByInfo = GroupByInfoNg(field = "deleted", value_alias = Seq(
-        ("0", s"company_send_announcement_del_0")
-        , ("1", s"company_send_announcement_del_1")
+        ("0", s"company_zxr_final_case_del_0")
+        , ("1", s"company_zxr_final_case_del_1")
       ))
     )
 

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

@@ -143,7 +143,7 @@ object export_company_index_2_es {
       , "rowkey,mortgagor_company_id,mortgagee_company_id,mortgagor,mortgagee,use_for,area,evaluate_amount,mortgage_amount,start_date,deleted".split(","))
 
     , export_2_es_args("company_judicial_assistance"
-      , "rowkey,company_name,company_id,executed_person_id,executed_person,equity_amount,execute_notice_num,executive_court,type_state,deleted".split(","))
+      , "rowkey,company_name,company_id,fz_publicity_date,executed_person_id,executed_person,equity_amount,execute_notice_num,executive_court,type_state,deleted".split(","))
 
     , export_2_es_args("company_public_announcement"
       , "rowkey,company_id,bill_type,bill_num,bill_amt,apply_name,publish_date,court,deleted".split(","))