fix: 司法协助支持重跑

src/main/scala/com/winhc/bigdata/spark/jobs/company_judicial_assistance.scala

@@ -3,7 +3,7 @@ package com.winhc.bigdata.spark.jobs
 import com.winhc.bigdata.spark.config.PhoenixConfig
 import com.winhc.bigdata.spark.udf.BaseFunc
 import com.winhc.bigdata.spark.utils.BaseUtil.isWindows
-import com.winhc.bigdata.spark.utils.{CompanyCidAndNameUtils, CompanySummaryPro, LoggingUtils, SparkUtils}
+import com.winhc.bigdata.spark.utils.{BaseUtil, CompanyCidAndNameUtils, CompanySummaryPro, LoggingUtils, SparkUtils}
 import org.apache.spark.internal.Logging
 import org.apache.spark.sql.SparkSession
 import org.apache.spark.sql.functions.col
@@ -323,14 +323,14 @@ case class company_judicial_assistance(s: SparkSession,
     }
 
 
-    def inc(): Unit = {
+    def inc(ds: String): Unit = {
       sql(
         s"""
            |SELECT  cid
            |        ,current_cid AS new_cid
            |        ,name AS cname
            |FROM    winhc_eci_dev.inc_ads_company
-           |WHERE   ds > '$ads_last_ds'
+           |WHERE   ds > '$ds'
            |AND     current_cid IS NOT NULL
            |""".stripMargin)
         .createOrReplaceTempView("tmp_company_cid_change")
@@ -339,7 +339,7 @@ case class company_judicial_assistance(s: SparkSession,
         s"""
            |SELECT  ${intersect_ods_cols.mkString(",")}
            |FROM    $inc_ods_tab
-           |WHERE   ds > '$inc_ads_last_ds'
+           |WHERE   ds > '$ds'
            |""".stripMargin)
         .repartition(500)
         .createOrReplaceTempView("company_judicial_assistance_inc")
@@ -516,8 +516,12 @@ case class company_judicial_assistance(s: SparkSession,
       println("all...")
       all()
     } else {
+      var ds: String = inc_ads_last_ds
+      if (inc_ods_last_ds.equals(inc_ads_last_ds)) {
+        ds = BaseUtil.atDaysAfter(-1, inc_ads_last_ds)
+      }
       println("inc...")
-      inc()
+      inc(ds)
     }
 
   }