xufei пре 5 година
родитељ
комит
6337e01c9a

+ 9 - 5
src/main/scala/com/winhc/bigdata/spark/jobs/CompanyCourtAnnouncement.scala

@@ -63,8 +63,13 @@ case class CompanyCourtAnnouncement(s: SparkSession, project: String, //表所
     }
     val ads_eci_debtor_relation = s"${project}.ads_eci_debtor_relation" //债权全量表
     val debtorRelationDs = getPartion(ads_eci_debtor_relation, spark)
-    val ads_address = s"${project}.inc_ads_${tableName}_address" //增量地址表
-    val ads_yg_bg = s"${project}.inc_ads_${tableName}_bg_yg" //增量原被告-原告表
+
+    //结果表导入生产表
+//    val ads_address = s"${project}.inc_ads_${tableName}_address" //增量地址表
+//    val ads_yg_bg = s"${project}.inc_ads_${tableName}_bg_yg" //增量原被告-原告表
+
+    val ads_address = s"winhc_eci.inc_ads_${tableName}_address" //增量地址表
+    val ads_yg_bg = s"winhc_eci.inc_ads_${tableName}_bg_yg" //增量原被告-原告表
 
     //被告
     val df = sql(
@@ -458,7 +463,6 @@ case class CompanyCourtAnnouncement(s: SparkSession, project: String, //表所
   }
 
 
-
 }
 
 object CompanyCourtAnnouncement {
@@ -499,7 +503,7 @@ object CompanyCourtAnnouncement {
     if (!runOld) {
       val flag = announcement.preCalc()
       //增量没更新返回
-      if(!flag) return
+      if (!flag) return
     }
     announcement.calc(runOld)
     spark.stop()
@@ -507,7 +511,7 @@ object CompanyCourtAnnouncement {
 
 }
 
-object EsQuery{
+object EsQuery {
   def queryCompany(restClient: RestClient, companyName: String) = {
     val query =
       s"""