Browse Source

Merge remote-tracking branch 'origin/master'

许家凯 3 years ago
parent
commit
17e8f90218

+ 1 - 1
src/main/scala/com/winhc/bigdata/spark/ng/dynamic/handle/bankruptcy_open_case.scala

@@ -14,7 +14,7 @@ case class bankruptcy_open_case(is_inc: Boolean) extends DailyAggHandle with Com
 
 
   override def getAssociationEntityInfo(new_data: Map[String, String]): Seq[AssociationEntityInfo] = {
-    getEntity(new_data("respondent_info"), id_key = "litigant_id", name_key = "name", NgCompanyRiskLevelType.Caution, null)
+    getEntity(new_data("respondent_info"), id_key = "litigant_id", name_key = "name", NgCompanyRiskLevelType.HighRisk, null)
   }
 }
 

+ 1 - 1
src/main/scala/com/winhc/bigdata/spark/ng/dynamic/handle/company_brief_cancel_announcement.scala

@@ -17,7 +17,7 @@ case class company_brief_cancel_announcement(is_inc:Boolean) extends DailyAggHan
   override def getAssociationEntityInfo(new_data: Map[String, String]): Seq[AssociationEntityInfo] = {
     val keyno = new_data.getOrEmptyStr("company_id")
     val name = new_data.getOrEmptyStr("company_name")
-    Seq(AssociationEntityInfo(keyno = keyno, name = name, risk_level = NgCompanyRiskLevelType.Caution, null))
+    Seq(AssociationEntityInfo(keyno = keyno, name = name, risk_level = NgCompanyRiskLevelType.HighRisk, null))
 
   }
 }

+ 1 - 1
src/main/scala/com/winhc/bigdata/spark/ng/dynamic/handle/company_dishonest_info.scala

@@ -17,7 +17,7 @@ case class company_dishonest_info(is_inc:Boolean) extends DailyAggHandle with Si
   override def getAssociationEntityInfo(new_data: Map[String, String]): Seq[AssociationEntityInfo] = {
     val keyno = new_data.getOrEmptyStr("keyno")
     val name = new_data.getOrEmptyStr("name")
-    Seq(AssociationEntityInfo(keyno = keyno, name = name, risk_level = NgCompanyRiskLevelType.Caution, null))
+    Seq(AssociationEntityInfo(keyno = keyno, name = name, risk_level = NgCompanyRiskLevelType.HighRisk, null))
 
   }
 }

+ 1 - 1
src/main/scala/com/winhc/bigdata/spark/ng/dynamic/handle/company_illegal_info.scala

@@ -15,7 +15,7 @@ case class company_illegal_info(is_inc:Boolean) extends DailyAggHandle  with Sim
   override def getAssociationEntityInfo(new_data: Map[String, String]): Seq[AssociationEntityInfo] = {
     val keyno = new_data.getOrEmptyStr("company_id")
     val name = new_data.getOrEmptyStr("company_name")
-    Seq(AssociationEntityInfo(keyno = keyno, name = name, risk_level = NgCompanyRiskLevelType.Caution, null))
+    Seq(AssociationEntityInfo(keyno = keyno, name = name, risk_level = NgCompanyRiskLevelType.HighRisk, null))
 
   }
 }

+ 1 - 1
src/main/scala/com/winhc/bigdata/spark/ng/dynamic/handle/company_own_tax.scala

@@ -15,7 +15,7 @@ case class company_own_tax(is_inc:Boolean) extends DailyAggHandle  with SimpleDa
   override def getAssociationEntityInfo(new_data: Map[String, String]): Seq[AssociationEntityInfo] = {
     val keyno = new_data.getOrEmptyStr("company_id")
     val name = new_data.getOrEmptyStr("company_name")
-    Seq(AssociationEntityInfo(keyno = keyno, name = name, risk_level = NgCompanyRiskLevelType.Caution, null))
+    Seq(AssociationEntityInfo(keyno = keyno, name = name, risk_level = NgCompanyRiskLevelType.HighRisk, null))
 
   }
 }

+ 1 - 1
src/main/scala/com/winhc/bigdata/spark/ng/dynamic/handle/company_zxr.scala

@@ -17,7 +17,7 @@ case class company_zxr(is_inc:Boolean) extends DailyAggHandle  with SimpleDailyD
   override def getAssociationEntityInfo(new_data: Map[String, String]): Seq[AssociationEntityInfo] = {
     val keyno = new_data.getOrEmptyStr("keyno")
     val name = new_data.getOrEmptyStr("name")
-    Seq(AssociationEntityInfo(keyno = keyno, name = name, risk_level = NgCompanyRiskLevelType.Caution, null))
+    Seq(AssociationEntityInfo(keyno = keyno, name = name, risk_level = NgCompanyRiskLevelType.HighRisk, null))
 
   }
 }

+ 1 - 1
src/main/scala/com/winhc/bigdata/spark/ng/dynamic/handle/company_zxr_final_case.scala

@@ -17,7 +17,7 @@ case class company_zxr_final_case(is_inc:Boolean) extends DailyAggHandle  with S
   override def getAssociationEntityInfo(new_data: Map[String, String]): Seq[AssociationEntityInfo] = {
     val keyno = new_data.getOrEmptyStr("keyno")
     val name = new_data.getOrEmptyStr("name")
-    Seq(AssociationEntityInfo(keyno = keyno, name = name, risk_level = NgCompanyRiskLevelType.Caution, null))
+    Seq(AssociationEntityInfo(keyno = keyno, name = name, risk_level = NgCompanyRiskLevelType.HighRisk, null))
 
   }
 }

+ 2 - 2
src/main/scala/com/winhc/bigdata/spark/ng/dynamic/handle/company_zxr_restrict.scala

@@ -19,10 +19,10 @@ case class company_zxr_restrict(is_inc:Boolean) extends DailyAggHandle with Simp
     Seq(
       AssociationEntityInfo(keyno = new_data.getOrEmptyStr("company_id")
         , name = new_data.getOrEmptyStr("company_name")
-        , risk_level = NgCompanyRiskLevelType.Caution, null)
+        , risk_level = NgCompanyRiskLevelType.HighRisk, null)
       ,AssociationEntityInfo(keyno = new_data.getOrEmptyStr("pid")
         , name = new_data.getOrEmptyStr("person_name")
-        , risk_level = NgCompanyRiskLevelType.Caution, null)
+        , risk_level = NgCompanyRiskLevelType.HighRisk, null)
     )
 
   }

+ 2 - 2
src/main/scala/com/winhc/bigdata/spark/ng/dynamic/handle/restrictions_on_exit.scala

@@ -19,10 +19,10 @@ case class restrictions_on_exit(is_inc:Boolean) extends DailyAggHandle  with Sim
     Seq(
       AssociationEntityInfo(keyno = new_data.getOrEmptyStr("limited_person_pid")
         , name = new_data.getOrEmptyStr("limited_person")
-        , risk_level = NgCompanyRiskLevelType.Caution, null)
+        , risk_level = NgCompanyRiskLevelType.HighRisk, null)
       ,AssociationEntityInfo(keyno = new_data.getOrEmptyStr("executed_person_keyno")
         , name = new_data.getOrEmptyStr("executed_person_name")
-        , risk_level = NgCompanyRiskLevelType.Caution, null)
+        , risk_level = NgCompanyRiskLevelType.HighRisk, null)
     )
 
   }

+ 4 - 0
src/main/scala/com/winhc/bigdata/spark/ng/jobs/args_company_job.scala

@@ -413,6 +413,10 @@ object args_company_job {
       , rowkey_udf = "md5(cleanup(concat_ws('', company_id, change_item, split_date(cast(change_time as String)))))"
       , is_super_filter = false
     )
+    , args_company_job("company_account_with_bank", Seq.empty
+      , rowkey_udf = "company_id"
+      , is_super_filter = false
+    )
   )
 
   def get_args_company_job(tn: String): args_company_job = {