Przeglądaj źródła

feat(ng.change): table bizData 修改为业务时间

JimZhang 3 lat temu
rodzic
commit
1e882e75a5
27 zmienionych plików z 27 dodań i 27 usunięć
  1. 1 1
      src/main/scala/com/winhc/bigdata/spark/ng/change/table/auction_tracking.scala
  2. 1 1
      src/main/scala/com/winhc/bigdata/spark/ng/change/table/bankruptcy_open_case.scala
  3. 1 1
      src/main/scala/com/winhc/bigdata/spark/ng/change/table/company_abnormal_info.scala
  4. 1 1
      src/main/scala/com/winhc/bigdata/spark/ng/change/table/company_brief_cancel_announcement.scala
  5. 1 1
      src/main/scala/com/winhc/bigdata/spark/ng/change/table/company_court_announcement.scala
  6. 1 1
      src/main/scala/com/winhc/bigdata/spark/ng/change/table/company_court_open_announcement.scala
  7. 1 1
      src/main/scala/com/winhc/bigdata/spark/ng/change/table/company_court_register.scala
  8. 1 1
      src/main/scala/com/winhc/bigdata/spark/ng/change/table/company_dishonest_info.scala
  9. 1 1
      src/main/scala/com/winhc/bigdata/spark/ng/change/table/company_env_punishment.scala
  10. 1 1
      src/main/scala/com/winhc/bigdata/spark/ng/change/table/company_equity_info.scala
  11. 1 1
      src/main/scala/com/winhc/bigdata/spark/ng/change/table/company_illegal_info.scala
  12. 1 1
      src/main/scala/com/winhc/bigdata/spark/ng/change/table/company_judicial_assistance.scala
  13. 1 1
      src/main/scala/com/winhc/bigdata/spark/ng/change/table/company_land_announcement.scala
  14. 1 1
      src/main/scala/com/winhc/bigdata/spark/ng/change/table/company_land_mortgage.scala
  15. 1 1
      src/main/scala/com/winhc/bigdata/spark/ng/change/table/company_land_publicity.scala
  16. 1 1
      src/main/scala/com/winhc/bigdata/spark/ng/change/table/company_land_transfer.scala
  17. 1 1
      src/main/scala/com/winhc/bigdata/spark/ng/change/table/company_own_tax.scala
  18. 1 1
      src/main/scala/com/winhc/bigdata/spark/ng/change/table/company_public_announcement.scala
  19. 1 1
      src/main/scala/com/winhc/bigdata/spark/ng/change/table/company_punishment_info.scala
  20. 1 1
      src/main/scala/com/winhc/bigdata/spark/ng/change/table/company_punishment_info_creditchina.scala
  21. 1 1
      src/main/scala/com/winhc/bigdata/spark/ng/change/table/company_send_announcement.scala
  22. 1 1
      src/main/scala/com/winhc/bigdata/spark/ng/change/table/company_tax_contravention.scala
  23. 1 1
      src/main/scala/com/winhc/bigdata/spark/ng/change/table/company_zxr.scala
  24. 1 1
      src/main/scala/com/winhc/bigdata/spark/ng/change/table/company_zxr_final_case.scala
  25. 1 1
      src/main/scala/com/winhc/bigdata/spark/ng/change/table/company_zxr_restrict.scala
  26. 1 1
      src/main/scala/com/winhc/bigdata/spark/ng/change/table/restrictions_on_exit.scala
  27. 1 1
      src/main/scala/com/winhc/bigdata/spark/ng/change/table/zxr_evaluate_results.scala

+ 1 - 1
src/main/scala/com/winhc/bigdata/spark/ng/change/table/auction_tracking.scala

@@ -9,5 +9,5 @@ import com.winhc.bigdata.spark.implicits.Bool._
 case class auction_tracking(equCols: Seq[String],is_inc:Boolean) extends NgCompanyChangeHandle {
 
 
-  override protected def getBizDate(newMap: Map[String, String]): String = is_inc? DateUtils.getBizDate(newMap("update_time")) | DateUtils.getBizDate(newMap("start_time"))
+  override protected def getBizDate(newMap: Map[String, String]): String = DateUtils.getBizDate(newMap("start_time"))
 }

+ 1 - 1
src/main/scala/com/winhc/bigdata/spark/ng/change/table/bankruptcy_open_case.scala

@@ -9,6 +9,6 @@ import com.winhc.bigdata.spark.implicits.Bool._
 case class bankruptcy_open_case(equCols: Seq[String],is_inc:Boolean) extends NgCompanyChangeHandle {
 
 
-  override protected def getBizDate(newMap: Map[String, String]): String = is_inc?DateUtils.getBizDate(newMap("update_time"))|DateUtils.getBizDate(newMap("public_date"))
+  override protected def getBizDate(newMap: Map[String, String]): String = DateUtils.getBizDate(newMap("public_date"))
 }
 

+ 1 - 1
src/main/scala/com/winhc/bigdata/spark/ng/change/table/company_abnormal_info.scala

@@ -9,5 +9,5 @@ import com.winhc.bigdata.spark.implicits.Bool._
 case class company_abnormal_info(equCols: Seq[String],is_inc:Boolean) extends NgCompanyChangeHandle {
 
 
-  override protected def getBizDate(newMap: Map[String, String]): String = is_inc? DateUtils.getBizDate(newMap("update_time"))|DateUtils.getBizDate(newMap("put_date"))
+  override protected def getBizDate(newMap: Map[String, String]): String = DateUtils.getBizDate(newMap("put_date"))
 }

+ 1 - 1
src/main/scala/com/winhc/bigdata/spark/ng/change/table/company_brief_cancel_announcement.scala

@@ -11,7 +11,7 @@ import scala.util.matching.Regex
 
 case class company_brief_cancel_announcement(equCols: Seq[String], is_inc: Boolean) extends NgCompanyChangeHandle {
 
-  override protected def getBizDate(newMap: Map[String, String]): String = is_inc ? DateUtils.getBizDate(newMap("update_time")) | DateUtils.getBizDate(get_announcement_start_date(newMap("announcement_term")).orNull, newMap("update_time"))
+  override protected def getBizDate(newMap: Map[String, String]): String = DateUtils.getBizDate(get_announcement_start_date(newMap("announcement_term")).orNull)
 
   private val p = "(?<start>[1-2]\\d{3}年[0-1][1-9]月[0-3]\\d日) - (?<end>[1-2]\\d{3}年[0-1][1-9]月[0-3]\\d日)".r
 

+ 1 - 1
src/main/scala/com/winhc/bigdata/spark/ng/change/table/company_court_announcement.scala

@@ -10,5 +10,5 @@ import com.winhc.bigdata.spark.implicits.Bool._
 case class company_court_announcement(equCols: Seq[String],is_inc:Boolean) extends NgCompanyChangeHandle {
 
 
-  override protected def getBizDate(newMap: Map[String, String]): String = is_inc? DateUtils.getBizDate(newMap("update_time"))|DateUtils.getBizDate(newMap("publish_date"))
+  override protected def getBizDate(newMap: Map[String, String]): String =  DateUtils.getBizDate(newMap("publish_date"))
 }

+ 1 - 1
src/main/scala/com/winhc/bigdata/spark/ng/change/table/company_court_open_announcement.scala

@@ -9,5 +9,5 @@ import com.winhc.bigdata.spark.implicits.Bool._
 case class company_court_open_announcement(equCols: Seq[String],is_inc:Boolean) extends NgCompanyChangeHandle {
 
 
-  override protected def getBizDate(newMap: Map[String, String]): String = is_inc?DateUtils.getBizDate(newMap("update_time"))|DateUtils.getBizDate(newMap("start_date"))
+  override protected def getBizDate(newMap: Map[String, String]): String =  DateUtils.getBizDate(newMap("start_date"))
 }

+ 1 - 1
src/main/scala/com/winhc/bigdata/spark/ng/change/table/company_court_register.scala

@@ -9,5 +9,5 @@ import com.winhc.bigdata.spark.implicits.Bool._
 case class company_court_register(equCols: Seq[String],is_inc:Boolean) extends NgCompanyChangeHandle {
 
 
-  override protected def getBizDate(newMap: Map[String, String]): String = is_inc?DateUtils.getBizDate(newMap("update_time"))|DateUtils.getBizDate(newMap("filing_date"))
+  override protected def getBizDate(newMap: Map[String, String]): String =  DateUtils.getBizDate(newMap("filing_date"))
 }

+ 1 - 1
src/main/scala/com/winhc/bigdata/spark/ng/change/table/company_dishonest_info.scala

@@ -9,6 +9,6 @@ import com.winhc.bigdata.spark.implicits.Bool._
 case class company_dishonest_info(equCols: Seq[String],is_inc:Boolean) extends NgCompanyChangeHandle {
 
 
-  override protected def getBizDate(newMap: Map[String, String]): String = is_inc?DateUtils.getBizDate(newMap("update_time"))|DateUtils.getBizDate(newMap("pub_date"))
+  override protected def getBizDate(newMap: Map[String, String]): String =  DateUtils.getBizDate(newMap("pub_date"))
 }
 

+ 1 - 1
src/main/scala/com/winhc/bigdata/spark/ng/change/table/company_env_punishment.scala

@@ -9,5 +9,5 @@ import com.winhc.bigdata.spark.implicits.Bool._
 case class company_env_punishment(equCols: Seq[String],is_inc:Boolean) extends NgCompanyChangeHandle {
 
 
-  override protected def getBizDate(newMap: Map[String, String]): String = is_inc?DateUtils.getBizDate(newMap("update_time"))|DateUtils.getBizDate(newMap("publish_time"))
+  override protected def getBizDate(newMap: Map[String, String]): String =  DateUtils.getBizDate(newMap("publish_time"))
 }

+ 1 - 1
src/main/scala/com/winhc/bigdata/spark/ng/change/table/company_equity_info.scala

@@ -8,6 +8,6 @@ import com.winhc.bigdata.spark.utils.DateUtils
 case class company_equity_info(equCols: Seq[String], is_inc:Boolean) extends NgCompanyChangeHandle {
 
 
-  override protected def getBizDate(newMap: Map[String, String]): String = DateUtils.getBizDate(newMap("reg_date"),newMap("update_time"))
+  override protected def getBizDate(newMap: Map[String, String]): String = DateUtils.getBizDate(newMap("reg_date"))
 }
 

+ 1 - 1
src/main/scala/com/winhc/bigdata/spark/ng/change/table/company_illegal_info.scala

@@ -9,5 +9,5 @@ import com.winhc.bigdata.spark.implicits.Bool._
 case class company_illegal_info(equCols: Seq[String],is_inc:Boolean) extends NgCompanyChangeHandle {
 
 
-  override protected def getBizDate(newMap: Map[String, String]): String = is_inc?DateUtils.getBizDate(newMap("update_time"))|DateUtils.getBizDate(newMap("put_date"))
+  override protected def getBizDate(newMap: Map[String, String]): String =  DateUtils.getBizDate(newMap("put_date"))
 }

+ 1 - 1
src/main/scala/com/winhc/bigdata/spark/ng/change/table/company_judicial_assistance.scala

@@ -8,6 +8,6 @@ import com.winhc.bigdata.spark.utils.DateUtils
 case class company_judicial_assistance(equCols: Seq[String], is_inc:Boolean) extends NgCompanyChangeHandle {
 
 
-  override protected def getBizDate(newMap: Map[String, String]): String = DateUtils.getBizDate(newMap("fz_publicity_date"),newMap("update_time"))
+  override protected def getBizDate(newMap: Map[String, String]): String = DateUtils.getBizDate(newMap("fz_publicity_date"))
 }
 

+ 1 - 1
src/main/scala/com/winhc/bigdata/spark/ng/change/table/company_land_announcement.scala

@@ -9,6 +9,6 @@ import com.winhc.bigdata.spark.implicits.Bool._
 case class company_land_announcement(equCols: Seq[String],is_inc:Boolean) extends NgCompanyChangeHandle {
 
 
-  override protected def getBizDate(newMap: Map[String, String]): String = is_inc?DateUtils.getBizDate(newMap("update_time"))|DateUtils.getBizDate(newMap("contract_date"))
+  override protected def getBizDate(newMap: Map[String, String]): String =  DateUtils.getBizDate(newMap("contract_date"))
 }
 

+ 1 - 1
src/main/scala/com/winhc/bigdata/spark/ng/change/table/company_land_mortgage.scala

@@ -8,6 +8,6 @@ import com.winhc.bigdata.spark.utils.DateUtils
 case class company_land_mortgage(equCols: Seq[String], is_inc:Boolean) extends NgCompanyChangeHandle {
 
 
-  override protected def getBizDate(newMap: Map[String, String]): String = DateUtils.getBizDate(newMap("start_date"),newMap("update_time"))
+  override protected def getBizDate(newMap: Map[String, String]): String = DateUtils.getBizDate(newMap("start_date"))
 }
 

+ 1 - 1
src/main/scala/com/winhc/bigdata/spark/ng/change/table/company_land_publicity.scala

@@ -9,6 +9,6 @@ import com.winhc.bigdata.spark.implicits.Bool._
 case class company_land_publicity(equCols: Seq[String], is_inc: Boolean) extends NgCompanyChangeHandle {
 
 
-  override protected def getBizDate(newMap: Map[String, String]): String = is_inc ? DateUtils.getBizDate(newMap("update_time")) | DateUtils.getBizDate(newMap("publication_date"), newMap("publication_start_date"))
+  override protected def getBizDate(newMap: Map[String, String]): String =  DateUtils.getBizDate(newMap("publication_date"), newMap("publication_start_date"))
 }
 

+ 1 - 1
src/main/scala/com/winhc/bigdata/spark/ng/change/table/company_land_transfer.scala

@@ -9,6 +9,6 @@ import com.winhc.bigdata.spark.implicits.Bool._
 case class company_land_transfer(equCols: Seq[String],is_inc:Boolean) extends NgCompanyChangeHandle {
 
 
-  override protected def getBizDate(newMap: Map[String, String]): String = is_inc?DateUtils.getBizDate(newMap("update_time"))|DateUtils.getBizDate(newMap("merchandise_time"))
+  override protected def getBizDate(newMap: Map[String, String]): String =  DateUtils.getBizDate(newMap("merchandise_time"))
 }
 

+ 1 - 1
src/main/scala/com/winhc/bigdata/spark/ng/change/table/company_own_tax.scala

@@ -9,5 +9,5 @@ import com.winhc.bigdata.spark.implicits.Bool._
 case class company_own_tax(equCols: Seq[String],is_inc:Boolean) extends NgCompanyChangeHandle {
 
 
-  override protected def getBizDate(newMap: Map[String, String]): String = is_inc?DateUtils.getBizDate(newMap("update_time"))|DateUtils.getBizDate(newMap("publish_date"))
+  override protected def getBizDate(newMap: Map[String, String]): String =  DateUtils.getBizDate(newMap("publish_date"))
 }

+ 1 - 1
src/main/scala/com/winhc/bigdata/spark/ng/change/table/company_public_announcement.scala

@@ -9,6 +9,6 @@ import com.winhc.bigdata.spark.implicits.Bool._
 case class company_public_announcement(equCols: Seq[String],is_inc:Boolean) extends NgCompanyChangeHandle {
 
 
-  override protected def getBizDate(newMap: Map[String, String]): String = is_inc?DateUtils.getBizDate(newMap("update_time"))|DateUtils.getBizDate(newMap("publish_date"))
+  override protected def getBizDate(newMap: Map[String, String]): String =  DateUtils.getBizDate(newMap("publish_date"))
 }
 

+ 1 - 1
src/main/scala/com/winhc/bigdata/spark/ng/change/table/company_punishment_info.scala

@@ -9,5 +9,5 @@ import com.winhc.bigdata.spark.implicits.Bool._
 case class company_punishment_info(equCols: Seq[String],is_inc:Boolean) extends NgCompanyChangeHandle {
 
 
-  override protected def getBizDate(newMap: Map[String, String]): String = is_inc?DateUtils.getBizDate(newMap("update_time"))|DateUtils.getBizDate(newMap("decision_date"))
+  override protected def getBizDate(newMap: Map[String, String]): String =  DateUtils.getBizDate(newMap("decision_date"))
 }

+ 1 - 1
src/main/scala/com/winhc/bigdata/spark/ng/change/table/company_punishment_info_creditchina.scala

@@ -9,5 +9,5 @@ import com.winhc.bigdata.spark.implicits.Bool._
 case class company_punishment_info_creditchina(equCols: Seq[String],is_inc:Boolean) extends NgCompanyChangeHandle {
 
 
-  override protected def getBizDate(newMap: Map[String, String]): String = is_inc?DateUtils.getBizDate(newMap("update_time"))|DateUtils.getBizDate(newMap("decision_date"))
+  override protected def getBizDate(newMap: Map[String, String]): String =  DateUtils.getBizDate(newMap("decision_date"))
 }

+ 1 - 1
src/main/scala/com/winhc/bigdata/spark/ng/change/table/company_send_announcement.scala

@@ -9,5 +9,5 @@ import com.winhc.bigdata.spark.implicits.Bool._
 case class company_send_announcement(equCols: Seq[String],is_inc:Boolean) extends NgCompanyChangeHandle {
 
 
-  override protected def getBizDate(newMap: Map[String, String]): String = is_inc?DateUtils.getBizDate(newMap("update_time"))|DateUtils.getBizDate(newMap("start_date"))
+  override protected def getBizDate(newMap: Map[String, String]): String =  DateUtils.getBizDate(newMap("start_date"))
 }

+ 1 - 1
src/main/scala/com/winhc/bigdata/spark/ng/change/table/company_tax_contravention.scala

@@ -9,5 +9,5 @@ import com.winhc.bigdata.spark.implicits.Bool._
 case class company_tax_contravention(equCols: Seq[String],is_inc:Boolean) extends NgCompanyChangeHandle {
 
 
-  override protected def getBizDate(newMap: Map[String, String]): String = is_inc?DateUtils.getBizDate(newMap("update_time"))|DateUtils.getBizDate(newMap("publish_time"))
+  override protected def getBizDate(newMap: Map[String, String]): String =  DateUtils.getBizDate(newMap("publish_time"))
 }

+ 1 - 1
src/main/scala/com/winhc/bigdata/spark/ng/change/table/company_zxr.scala

@@ -9,6 +9,6 @@ import com.winhc.bigdata.spark.implicits.Bool._
 case class company_zxr(equCols: Seq[String],is_inc:Boolean) extends NgCompanyChangeHandle {
 
 
-  override protected def getBizDate(newMap: Map[String, String]): String = is_inc?DateUtils.getBizDate(newMap("update_time"))|DateUtils.getBizDate(newMap("case_create_time"))
+  override protected def getBizDate(newMap: Map[String, String]): String =  DateUtils.getBizDate(newMap("case_create_time"))
 }
 

+ 1 - 1
src/main/scala/com/winhc/bigdata/spark/ng/change/table/company_zxr_final_case.scala

@@ -9,6 +9,6 @@ import com.winhc.bigdata.spark.implicits.Bool._
 case class company_zxr_final_case(equCols: Seq[String],is_inc:Boolean) extends NgCompanyChangeHandle {
 
 
-  override protected def getBizDate(newMap: Map[String, String]): String = is_inc?DateUtils.getBizDate(newMap("update_time"))|DateUtils.getBizDate(newMap("case_final_time"))
+  override protected def getBizDate(newMap: Map[String, String]): String =  DateUtils.getBizDate(newMap("case_final_time"))
 }
 

+ 1 - 1
src/main/scala/com/winhc/bigdata/spark/ng/change/table/company_zxr_restrict.scala

@@ -9,6 +9,6 @@ import com.winhc.bigdata.spark.implicits.Bool._
 case class company_zxr_restrict(equCols: Seq[String],is_inc:Boolean) extends NgCompanyChangeHandle {
 
 
-  override protected def getBizDate(newMap: Map[String, String]): String = is_inc?DateUtils.getBizDate(newMap("update_time"))|DateUtils.getBizDate(newMap("case_create_time"))
+  override protected def getBizDate(newMap: Map[String, String]): String =  DateUtils.getBizDate(newMap("case_create_time"))
 }
 

+ 1 - 1
src/main/scala/com/winhc/bigdata/spark/ng/change/table/restrictions_on_exit.scala

@@ -9,6 +9,6 @@ import com.winhc.bigdata.spark.implicits.Bool._
 case class restrictions_on_exit(equCols: Seq[String],is_inc:Boolean) extends NgCompanyChangeHandle {
 
 
-  override protected def getBizDate(newMap: Map[String, String]): String = is_inc?DateUtils.getBizDate(newMap("update_time"))|DateUtils.getBizDate(newMap("publish_time"))
+  override protected def getBizDate(newMap: Map[String, String]): String =  DateUtils.getBizDate(newMap("publish_time"))
 }
 

+ 1 - 1
src/main/scala/com/winhc/bigdata/spark/ng/change/table/zxr_evaluate_results.scala

@@ -9,5 +9,5 @@ import com.winhc.bigdata.spark.implicits.Bool._
 case class zxr_evaluate_results(equCols: Seq[String],is_inc:Boolean) extends NgCompanyChangeHandle {
 
 
-  override protected def getBizDate(newMap: Map[String, String]): String = is_inc?DateUtils.getBizDate(newMap("update_time"))|DateUtils.getBizDate(newMap("publish_time"))
+  override protected def getBizDate(newMap: Map[String, String]): String =  DateUtils.getBizDate(newMap("publish_time"))
 }