许家凯 %!s(int64=3) %!d(string=hai) anos
pai
achega
7f4d415a9c

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

@@ -24,7 +24,7 @@ case class BusinessTotalDynamic(s: SparkSession
   private def getRdd: DataFrame = {
     val df = sql(
       s"""
-         |${generateAllTabSql("company_change", "winhc_ng")._1}
+         |${generateAllTabSql("company_change", "winhc_ng",maxDs = "20210811")._1}
          |AND change_time is not null
          |AND content_before is not null
          |AND content_after is not null

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

@@ -198,7 +198,7 @@ object NgCompanyDynamic {
     )
     val spark = SparkUtils.InitEnv(this.getClass.getSimpleName, config)
 
-    //    val tn = "company,company_staff,company_holder"
+    //    val tn = "auction_tracking,company_land_announcement,company_own_tax"
     val tn = "all"
     var dynamicArgs = NgCompanyDynamicArgs.getStartArgs(inc)
     var aggArgs = NgCompanyDynamicArgs.getAggArgs

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

@@ -27,7 +27,7 @@ case class company_mortgage_people(is_inc:Boolean)extends NgCompanyDynamicHandle
     val code = "304301"
 
     val entityInfo: Seq[AssociationEntityInfo] = Seq(
-      AssociationEntityInfo(keyno = new_data.getOrEmptyStr("application_name_id"), name = new_data.getOrEmptyStr("application_name"), risk_level = NgCompanyRiskLevelType.Prompt, rta_info = "抵押权人")
+      AssociationEntityInfo(keyno = new_data.getOrEmptyStr("application_company_id"), name = new_data.getOrEmptyStr("application_name"), risk_level = NgCompanyRiskLevelType.Prompt, rta_info = "抵押权人")
     )
 
     val dynamic_info = Map(

+ 2 - 4
src/main/scala/com/winhc/bigdata/spark/ng/dynamic/utils/BusinessTotalDynamicUtils.scala

@@ -6,7 +6,7 @@ import com.winhc.bigdata.spark.ng.dynamic.NgCompanyRiskLevelType.NgCompanyRiskLe
 import com.winhc.bigdata.spark.ng.dynamic.{AssociationEntityInfo, CompanyDynamicRecord, NgCompanyRiskLevelType}
 import com.winhc.bigdata.spark.utils.{BaseUtil, RegCapitalAmount}
 import org.apache.commons.lang3.StringUtils
-
+import com.winhc.bigdata.spark.implicits.CaseClass2JsonHelper._
 /**
  * @author: XuJiakai
  * @date: 2021/8/5 15:55
@@ -76,7 +76,7 @@ object BusinessTotalDynamicUtils {
       , tn = tn
       , update_type = "update"
       , dynamic_code = dynamicCode
-      , dynamic_info = map.toMap()
+      , dynamic_info = map.toJson().toAnyMap()
       , agg_detail_text = null
       , agg_detail_rowkey = null
       , biz_time = date
@@ -291,8 +291,6 @@ object BusinessTotalDynamicUtils {
     if (StringUtils.isEmpty(content_before) || StringUtils.isEmpty(content_after))
       return Seq.empty
 
-
-
     var entity: List[Map[String, String]] = List.empty
     if (change_info != null) {
       try {