Merge branch 'master' of http://139.224.213.4:3000/bigdata/Spark_Max

src/main/scala/com/winhc/bigdata/spark/jobs/dynamic/tables/company_equity_info.scala

@@ -62,7 +62,12 @@ case class company_equity_info() extends CompanyDynamicHandle {
    * @param new_map
    * @return
    */
-  override protected def get_rta_desc(old_map: Map[String, String], new_map: Map[String, String]): String = "新增1条股权出质信息"
+  override protected def get_rta_desc(old_map: Map[String, String], new_map: Map[String, String]): String =
+    s"""登记号：${new_map("reg_number")}
+       |出质人：${new_map("pledgor")}
+       |质权人：${new_map("pledgee")}
+       |公示日期：${new_map("pub_date")}
+       |变化情况：${new_map("change_situation")}""".stripMargin
 
   /*
    * 变更内容

src/main/scala/com/winhc/bigdata/spark/jobs/dynamic/tables/company_judicial_sale_combine_list.scala

@@ -9,6 +9,7 @@ import com.winhc.bigdata.spark.jobs.dynamic.CompanyDynamicHandle
  */
 case class company_judicial_sale_combine_list() extends CompanyDynamicHandle {
 
+  val fmt = new java.text.DecimalFormat("0.00")
 
   /**
    * 来源表的变更类型，insert or update
@@ -25,9 +26,9 @@ case class company_judicial_sale_combine_list() extends CompanyDynamicHandle {
    * @return
    */
   override protected def get_rta_desc(old_map: Map[String, String], new_map: Map[String, String]): String = {
-
+    val b = new_map("initial_price").toDouble
     s"""标题：${new_map("title")}
-       |起拍价：${new_map("initial_price")}
+       |起拍价：${fmt.format(b)}
        |拍卖时间：${new_map("start_time")}""".stripMargin
   }
 
@@ -38,9 +39,9 @@ case class company_judicial_sale_combine_list() extends CompanyDynamicHandle {
    * @param new_map
    * @return
    */
-//  override protected def get_change_content(old_map: Map[String, String], new_map: Map[String, String], cname: String): String = new_map.toJson(Seq(
-//    "source_id->address"
-//  ))
+  //  override protected def get_change_content(old_map: Map[String, String], new_map: Map[String, String], cname: String): String = new_map.toJson(Seq(
+  //    "source_id->address"
+  //  ))
 
   override protected def get_info_risk_level(old_map: Map[String, String], new_map: Map[String, String]): String = {
     "4"

src/main/scala/com/winhc/bigdata/spark/jobs/dynamic/tables/company_own_tax.scala

@@ -14,7 +14,13 @@ case class company_own_tax() extends CompanyDynamicHandle {
    * @param new_map
    * @return
    */
-  override protected def get_rta_desc(old_map: Map[String, String], new_map: Map[String, String]): String = new_map.getOrElse("name", null)
+  override protected def get_rta_desc(old_map: Map[String, String], new_map: Map[String, String]): String = {
+
+    s"""纳税人名称：${new_map("name")}
+       |欠税税种：${new_map("tax_category")}
+       |欠税金额：${new_map("tax_balance")}
+       |发布日期：${new_map("publish_date")}""".stripMargin
+  }
 
   /**
    * 变更内容