|
|
@@ -1,4 +1,4 @@
|
|
|
-package com.winhc.bigdata.spark.jobs
|
|
|
+package com.winhc.bigdata.spark.jobs.judicial
|
|
|
|
|
|
import com.winhc.bigdata.spark.udf.{BaseFunc, CompanyMapping, CourtRank}
|
|
|
import com.winhc.bigdata.spark.utils.BaseUtil.isWindows
|
|
|
@@ -131,7 +131,8 @@ case class JudicialCaseRelationPreNew(s: SparkSession, project: String, ds: Stri
|
|
|
sql(
|
|
|
s"""
|
|
|
|INSERT ${if (isWindows) "INTO" else "OVERWRITE"} table $project.ads_judicial_case_relation_pre partition(ds='$t1_ds',tn='wenshu')
|
|
|
- |SELECT a.judicase_id
|
|
|
+ |SELECT
|
|
|
+ | COALESCE(a.judicase_id,b.new_judicase_id) judicase_id
|
|
|
| ,'0' as flag
|
|
|
| ,title
|
|
|
| ,case_type
|
|
|
@@ -148,11 +149,12 @@ case class JudicialCaseRelationPreNew(s: SparkSession, project: String, ds: Stri
|
|
|
| SELECT *
|
|
|
| FROM $project.xjk_ads_judicial_case_relation1_tmp
|
|
|
| ) a
|
|
|
- |JOIN (
|
|
|
- | SELECT * FROM
|
|
|
+ |RIGHT JOIN (
|
|
|
+ | SELECT *,md5(cleanup(case_no)) as new_judicase_id
|
|
|
+ | FROM
|
|
|
| (
|
|
|
| SELECT *,row_number() over(partition by docid order by judge_date desc) num
|
|
|
- | FROM $project.ods_justicase
|
|
|
+ | FROM $project.ods_wenshu_detail
|
|
|
| WHERE ds > '0'
|
|
|
| )c
|
|
|
| where num = 1
|
|
|
@@ -337,8 +339,8 @@ case class JudicialCaseRelationPreNew(s: SparkSession, project: String, ds: Stri
|
|
|
| ,case_no_trim(case_no) as case_no
|
|
|
| ,court_name
|
|
|
| ,case_stage
|
|
|
- | ,yg_name
|
|
|
- | ,bg_name
|
|
|
+ | ,replace_char(yg_name) as yg_name
|
|
|
+ | ,replace_char(bg_name) as bg_name
|
|
|
| ,date
|
|
|
| ,detail_id
|
|
|
| ,case_amt
|
|
|
@@ -365,8 +367,8 @@ case class JudicialCaseRelationPreNew(s: SparkSession, project: String, ds: Stri
|
|
|
| ,case_stage
|
|
|
| ,case_label(flag) lable
|
|
|
| ,map_2_json(${getStrToMap(cols)}) as detail
|
|
|
- | ,yg_name
|
|
|
- | ,bg_name
|
|
|
+ | ,replace_char(yg_name) as yg_name
|
|
|
+ | ,replace_char(bg_name) as bg_name
|
|
|
| ,date
|
|
|
| ,detail_id
|
|
|
| ,case_amt
|
|
|
@@ -402,7 +404,7 @@ case class JudicialCaseRelationPreNew(s: SparkSession, project: String, ds: Stri
|
|
|
//司法案件主表
|
|
|
sql(
|
|
|
s"""
|
|
|
- |INSERT ${if (isWindows) "INTO" else "OVERWRITE"} TABLE $project.tmp_xf_judicial_case_relation_r1
|
|
|
+ |INSERT ${if (isWindows) "INTO" else "OVERWRITE"} TABLE winhc_eci.tmp_xf_judicial_case_relation_r1
|
|
|
|SELECT judicase_id
|
|
|
| ,max(first_title) title
|
|
|
| ,max(case_type) case_type
|
|
|
@@ -426,7 +428,7 @@ case class JudicialCaseRelationPreNew(s: SparkSession, project: String, ds: Stri
|
|
|
| FROM (
|
|
|
| SELECT *,court_level(court_name) court_level
|
|
|
| FROM $project.$t3
|
|
|
- | WHERE ds = '$t1_ds'
|
|
|
+ | WHERE ds >= '$second_ds'
|
|
|
| ) a JOIN
|
|
|
| (
|
|
|
| select *
|
|
|
@@ -439,7 +441,7 @@ case class JudicialCaseRelationPreNew(s: SparkSession, project: String, ds: Stri
|
|
|
//明细表
|
|
|
sql(
|
|
|
s"""
|
|
|
- |INSERT ${if (isWindows) "INTO" else "OVERWRITE"} TABLE $project.tmp_xf_judicial_case_relation_r2
|
|
|
+ |INSERT ${if (isWindows) "INTO" else "OVERWRITE"} TABLE winhc_eci.tmp_xf_judicial_case_relation_r2
|
|
|
|SELECT md5(concat_ws('',judicase_id,CLEANUP(case_no),case_stage)) id
|
|
|
| ,judicase_id
|
|
|
| ,max(first_title) title
|
|
|
@@ -461,7 +463,7 @@ case class JudicialCaseRelationPreNew(s: SparkSession, project: String, ds: Stri
|
|
|
| FROM (
|
|
|
| SELECT *
|
|
|
| FROM $project.$t3
|
|
|
- | WHERE ds = '$t1_ds'
|
|
|
+ | WHERE ds >= '$second_ds'
|
|
|
| )a JOIN
|
|
|
| (
|
|
|
| select *
|
xufei