@@ -297,7 +297,6 @@ object ChangeExtract {
, Args(tableName = "company_bid_list", primaryFields = "title")
, Args(tableName = "company_land_transfer", primaryFields = "num,location")
, Args(tableName = "company_employment", primaryFields = "title,cid,url_path")
- , Args(tableName = "company_brief_cancel_announcement_result", primaryFields = "cid,main_id")
, Args(tableName = "company_env_punishment", primaryFields = "punish_number")
, Args(tableName = "company_icp", primaryFields = "domain")
, Args(tableName = "company_punishment_info", primaryFields = "punish_number")
@@ -2,7 +2,7 @@
package com.winhc.bigdata.spark.jobs.chance.table
import com.winhc.bigdata.spark.jobs.chance.CompanyChangeHandle
-import com.winhc.bigdata.spark.utils.ChangeExtractUtils
+import com.winhc.bigdata.spark.utils.{ChangeExtractUtils, DateUtils}
/**
* @Author: Yan Yongnian
@@ -20,5 +20,5 @@ case class company_brief_cancel_announcement(equCols: Seq[String]) extends Compa
override def getLabel(oldMap: Map[String, String], newMap: Map[String, String]): String = ChangeExtractUtils.getTags(newMap, "简易注销", Array("company_name", "reg_number", "credit_code", "announcement_term", "reg_authority"))
- override def getBizTime(newMap: Map[String, String]): String = newMap("announcement_end_date")
+ override def getBizTime(newMap: Map[String, String]): String = DateUtils.getNotNullStr(newMap("announcement_end_date"),newMap("update_time"))
}
@@ -1,24 +0,0 @@
-
-package com.winhc.bigdata.spark.jobs.chance.table
-import com.winhc.bigdata.spark.jobs.chance.CompanyChangeHandle
-/**
- * @Author: XuJiakai
- * @Date: 2020/7/9 16:44
- * @Description:
- */
-//
-case class company_brief_cancel_announcement_result(equCols: Seq[String]) extends CompanyChangeHandle {
- override def getUpdateTitle(newMap: Map[String, String]): String = getValueOrNull(newMap("title"), s"${newMap("title")}简易注销信息发生变更")
- override def getInsertTitle(newMap: Map[String, String]): String = getValueOrNull(newMap("title"), s"新增${newMap("title")}简易注销信息")
- override def getLabel(oldMap: Map[String, String], newMap: Map[String, String]): String = ChangeExtractUtils.getTags(newMap, "简易注销", Array("cname", "brief_cancel_result"))
- override def getBizTime(newMap: Map[String, String]): String = newMap("start_date")
-}
* @Author: XuJiakai
@@ -20,5 +20,5 @@ case class company_env_punishment(equCols: Seq[String]) extends CompanyChangeHan
override def getLabel(oldMap: Map[String, String], newMap: Map[String, String]): String = ChangeExtractUtils.getTags(newMap, "环保处罚", Array("name", "department", "punish_number", "punish_basis", "law_break", "reason", "content", "deleted"))
- override def getBizTime(newMap: Map[String, String]): String = newMap("publish_time")
+ override def getBizTime(newMap: Map[String, String]): String = DateUtils.getNotNullStr(newMap("publish_time"),newMap("update_time"))
@@ -20,5 +20,5 @@ case class company_land_announcement(equCols: Seq[String]) extends CompanyChange
override def getLabel(oldMap: Map[String, String], newMap: Map[String, String]): String = ChangeExtractUtils.getTags(newMap, "购地信息", Array("project_name", "project_loc", "area", "tran_price", "e_number"))
- override def getBizTime(newMap: Map[String, String]): String = newMap("actual_start_time")
+ override def getBizTime(newMap: Map[String, String]): String = DateUtils.getNotNullStr(newMap("actual_start_time"),newMap("update_time"))
@@ -20,7 +20,7 @@ case class company_punishment_info(equCols: Seq[String]) extends CompanyChangeHa
str
- override def getBizTime(newMap: Map[String, String]): String = newMap("decision_date")
+ override def getBizTime(newMap: Map[String, String]): String = DateUtils.getNotNullStr(newMap("decision_date"),newMap("update_time"))
override def getUpdateTitle(newMap: Map[String, String]): String = getValueOrNull(newMap("punish_number"), s"${newMap("punish_number")}行政处罚发生变更")