Browse Source

fix: 企业动态换行调整

许家凯 4 years ago
parent
commit
35748f065d

+ 2 - 4
src/main/scala/com/winhc/bigdata/spark/jobs/dynamic/tables/company_check_info.scala

@@ -26,10 +26,8 @@ case class company_check_info() extends CompanyDynamicHandle {
    * @return
    */
   override protected def get_rta_desc(old_map: Map[String, String], new_map: Map[String, String]): String = {
-    s"""
-       |日期:${new_map("check_date")}
-       |结果:${new_map("check_result")}
-       |""".stripMargin
+    s"""日期:${new_map("check_date")}
+       |结果:${new_map("check_result")}""".stripMargin
   }
 
   /**

+ 2 - 5
src/main/scala/com/winhc/bigdata/spark/jobs/dynamic/tables/company_court_announcement_list.scala

@@ -1,6 +1,5 @@
 package com.winhc.bigdata.spark.jobs.dynamic.tables
 
-import com.winhc.bigdata.spark.implicits.MapHelper._
 import com.winhc.bigdata.spark.jobs.dynamic.CompanyDynamicHandle
 import org.apache.commons.lang3.StringUtils
 
@@ -27,12 +26,10 @@ case class company_court_announcement_list() extends CompanyDynamicHandle {
    * @return
    */
   override protected def get_rta_desc(old_map: Map[String, String], new_map: Map[String, String]): String = {
-    s"""
-       |案号:${new_map("case_no")}万元
+    s"""案号:${new_map("case_no")}万元
        |上诉人:${new_map("plaintiff")}
        |被上诉人:${new_map("litigant")}
-       |刊登日期:${new_map("publish_date")}
-       |""".stripMargin
+       |刊登日期:${new_map("publish_date")}""".stripMargin
   }
 
   /**

+ 2 - 4
src/main/scala/com/winhc/bigdata/spark/jobs/dynamic/tables/company_court_open_announcement_list.scala

@@ -28,11 +28,9 @@ case class company_court_open_announcement_list() extends CompanyDynamicHandle {
    */
   override protected def get_rta_desc(old_map: Map[String, String], new_map: Map[String, String]): String = {
 
-    s"""
-       |开庭时间:${new_map("start_date")}
+    s"""开庭时间:${new_map("start_date")}
        |案号:${new_map("case_no")}
-       |案由:${new_map("case_reason")}
-       |""".stripMargin
+       |案由:${new_map("case_reason")}""".stripMargin
   }
 
   /**

+ 2 - 4
src/main/scala/com/winhc/bigdata/spark/jobs/dynamic/tables/company_court_register_list.scala

@@ -28,11 +28,9 @@ case class company_court_register_list() extends CompanyDynamicHandle {
    */
   override protected def get_rta_desc(old_map: Map[String, String], new_map: Map[String, String]): String = {
 
-    s"""
-       |立案日期:${new_map("filing_date")}
+    s"""立案日期:${new_map("filing_date")}
        |上诉人:${new_map("plaintiff")}
-       |被上诉人:${new_map("defendant")}
-       |""".stripMargin
+       |被上诉人:${new_map("defendant")}""".stripMargin
   }
 
   /**

+ 2 - 4
src/main/scala/com/winhc/bigdata/spark/jobs/dynamic/tables/company_double_random_check_info.scala

@@ -25,12 +25,10 @@ case class company_double_random_check_info() extends CompanyDynamicHandle {
    * @return
    */
   override protected def get_rta_desc(old_map: Map[String, String], new_map: Map[String, String]): String = {
-    s"""
-       |任务编号:${new_map("check_task_num")}
+    s"""任务编号:${new_map("check_task_num")}
        |任务名称:${new_map("check_task_name")}
        |抽查机关:${new_map("check_department")}
-       |完成日期:${new_map("check_date")}
-       |""".stripMargin
+       |完成日期:${new_map("check_date")}""".stripMargin
   }
 
   /**

+ 2 - 5
src/main/scala/com/winhc/bigdata/spark/jobs/dynamic/tables/company_judicial_sale_combine_list.scala

@@ -1,6 +1,5 @@
 package com.winhc.bigdata.spark.jobs.dynamic.tables
 
-import com.winhc.bigdata.spark.implicits.MapHelper._
 import com.winhc.bigdata.spark.jobs.dynamic.CompanyDynamicHandle
 
 /**
@@ -27,11 +26,9 @@ case class company_judicial_sale_combine_list() extends CompanyDynamicHandle {
    */
   override protected def get_rta_desc(old_map: Map[String, String], new_map: Map[String, String]): String = {
 
-    s"""
-       |标题:${new_map("title")}
+    s"""标题:${new_map("title")}
        |起拍价:${new_map("initial_price")}
-       |拍卖时间:${new_map("start_time")}
-       |""".stripMargin
+       |拍卖时间:${new_map("start_time")}""".stripMargin
   }
 
   /**

+ 2 - 4
src/main/scala/com/winhc/bigdata/spark/jobs/dynamic/tables/company_license.scala

@@ -26,13 +26,11 @@ case class company_license() extends CompanyDynamicHandle {
    */
   override protected def get_rta_desc(old_map: Map[String, String], new_map: Map[String, String]): String = {
 
-    s"""
-       |许可证编号:${new_map("license_number")}
+    s"""许可证编号:${new_map("license_number")}
        |有效期自:${new_map("start_date")}
        |有效期至:${new_map("end_date")}
        |许可机关:${new_map("department")}
-       |许可内容:${new_map("scope")}
-       |""".stripMargin
+       |许可内容:${new_map("scope")}""".stripMargin
   }
 
   /**

+ 2 - 5
src/main/scala/com/winhc/bigdata/spark/jobs/dynamic/tables/company_license_creditchina.scala

@@ -1,6 +1,5 @@
 package com.winhc.bigdata.spark.jobs.dynamic.tables
 
-import com.winhc.bigdata.spark.implicits.MapHelper._
 import com.winhc.bigdata.spark.jobs.dynamic.CompanyDynamicHandle
 
 /**
@@ -27,13 +26,11 @@ case class company_license_creditchina() extends CompanyDynamicHandle {
    */
   override protected def get_rta_desc(old_map: Map[String, String], new_map: Map[String, String]): String = {
 
-    s"""
-       |许可证编号:${new_map("licence_number")}
+    s"""许可证编号:${new_map("licence_number")}
        |有效期自:${new_map("decision_date")}
        |有效期至:${new_map("end_date")}
        |许可机关:${new_map("department")}
-       |许可内容:${new_map("resume")}
-       |""".stripMargin
+       |许可内容:${new_map("resume")}""".stripMargin
   }
 
   /**

+ 2 - 4
src/main/scala/com/winhc/bigdata/spark/jobs/dynamic/tables/company_license_entpub.scala

@@ -26,13 +26,11 @@ case class company_license_entpub() extends CompanyDynamicHandle {
    */
   override protected def get_rta_desc(old_map: Map[String, String], new_map: Map[String, String]): String = {
 
-    s"""
-       |许可证编号:${new_map("license_number")}
+    s"""许可证编号:${new_map("license_number")}
        |有效期自:${new_map("start_date")}
        |有效期至:${new_map("end_date")}
        |许可机关:${new_map("department")}
-       |许可内容:${new_map("scope")}
-       |""".stripMargin
+       |许可内容:${new_map("scope")}""".stripMargin
   }
 
   /**

+ 2 - 5
src/main/scala/com/winhc/bigdata/spark/jobs/dynamic/tables/company_tax_contravention.scala

@@ -1,7 +1,6 @@
 package com.winhc.bigdata.spark.jobs.dynamic.tables
 
 import com.winhc.bigdata.spark.jobs.dynamic.CompanyDynamicHandle
-import com.winhc.bigdata.spark.implicits.MapHelper._
 import org.apache.commons.lang3.StringUtils
 
 /**
@@ -27,10 +26,8 @@ case class company_tax_contravention() extends CompanyDynamicHandle {
    * @return
    */
   override protected def get_rta_desc(old_map: Map[String, String], new_map: Map[String, String]): String = {
-    s"""
-       |案件性质:${new_map("case_type")}
-       |发布日期:${new_map("publish_time")}
-       |""".stripMargin
+    s"""案件性质:${new_map("case_type")}
+       |发布日期:${new_map("publish_time")}""".stripMargin
   }
 
   /**

+ 2 - 5
src/main/scala/com/winhc/bigdata/spark/jobs/dynamic/tables/company_zxr_final_case.scala

@@ -1,6 +1,5 @@
 package com.winhc.bigdata.spark.jobs.dynamic.tables
 
-import com.winhc.bigdata.spark.implicits.MapHelper._
 import com.winhc.bigdata.spark.jobs.dynamic.CompanyDynamicHandle
 
 /**
@@ -27,12 +26,10 @@ case class company_zxr_final_case() extends CompanyDynamicHandle {
    */
   override protected def get_rta_desc(old_map: Map[String, String], new_map: Map[String, String]): String = {
 
-    s"""
-       |案号:${new_map("case_no")}
+    s"""案号:${new_map("case_no")}
        |执行法院:${new_map("court_name")}
        |立案日期:${new_map("case_create_time")}
-       |终本日期:${new_map("case_final_time")}
-       |""".stripMargin
+       |终本日期:${new_map("case_final_time")}""".stripMargin
   }
 
   /**

+ 2 - 4
src/main/scala/com/winhc/bigdata/spark/jobs/dynamic/tables/wenshu_detail_combine.scala

@@ -35,12 +35,10 @@ case class wenshu_detail_combine() extends CompanyDynamicHandle {
         t2 = "被告"
       }
     }
-    s"""
-       |案由:${new_map("case_reason_level3")}
+    s"""案由:${new_map("case_reason_level3")}
        |案号:${new_map("case_no")}
        |诉讼身份:${t2}
-       |发布日期:${new_map("judge_date")}
-       |""".stripMargin
+       |发布日期:${new_map("judge_date")}""".stripMargin
   }
 
   /**