|
@@ -219,6 +219,7 @@ case class JudicialCaseRelationAggsV3(s: SparkSession, project: String, args_cas
|
|
|
|
|
|
val update = s"update"
|
|
|
val incr = s"incr"
|
|
|
+ val init_ds = "20220818"
|
|
|
|
|
|
private val cols_map: Map[String, String] = args_case_v3.cols_map
|
|
|
private val rowkey: String = args_case_v3.rowkey
|
|
@@ -229,13 +230,13 @@ case class JudicialCaseRelationAggsV3(s: SparkSession, project: String, args_cas
|
|
|
|
|
|
|
|
|
val pre_cols = getColumns(ads_judicial_case_relation_pre).diff(Seq("ds", "tn"))
|
|
|
- var last_ds = BaseUtil.getPartion(ads_judicial_case_relation_pre, tableName, spark)
|
|
|
- val calc_ds = BaseUtil.getYesterday()
|
|
|
+ var last_ds = init_ds
|
|
|
+ val calc_ds = init_ds
|
|
|
|
|
|
- if (calc_ds.equals(last_ds)) {
|
|
|
- last_ds = BaseUtil.getSecondPartion(ads_judicial_case_relation_pre, tableName, spark)
|
|
|
- }
|
|
|
- val is_incr = if (StringUtils.isBlank(last_ds)) false else true
|
|
|
+// if (calc_ds.equals(last_ds)) {
|
|
|
+// last_ds = BaseUtil.getSecondPartion(ads_judicial_case_relation_pre, tableName, spark)
|
|
|
+// }
|
|
|
+ val is_incr = false
|
|
|
|
|
|
val cols = pre_cols.map(c => {
|
|
|
if (cols_map.contains(c)) {
|
|
@@ -318,7 +319,8 @@ case class JudicialCaseRelationAggsV3(s: SparkSession, project: String, args_cas
|
|
|
| case_amt,
|
|
|
| judge_amt,
|
|
|
| exec_info,
|
|
|
- | case_end
|
|
|
+ | case_end,
|
|
|
+ | now() as update_time
|
|
|
|FROM
|
|
|
|(
|
|
|
|SELECT md5(concat_ws('',concat_ws('',judicase_id),CLEANUP(case_no))) id
|
|
@@ -393,7 +395,8 @@ case class JudicialCaseRelationAggsV3(s: SparkSession, project: String, args_cas
|
|
|
| date ,
|
|
|
| court_level ,
|
|
|
| 0 deleted ,
|
|
|
- | case_end
|
|
|
+ | case_end ,
|
|
|
+ | now() as update_time
|
|
|
|FROM
|
|
|
|(
|
|
|
|SELECT judicase_id
|