Ver código fonte

字段修改

xufei 4 anos atrás
pai
commit
9e84dfa1a8

+ 8 - 8
src/main/scala/com/winhc/bigdata/spark/jobs/judicial/JudicialCaseRelationPre10.scala

@@ -126,12 +126,12 @@ case class JudicialCaseRelationPre10(s: SparkSession, project: String
          |                WHERE   length(gist_id) >0 AND ds> '0'
          |                ) A
          |        LEFT JOIN (
-         |                SELECT  id,max(judicase_id) judicase_id
+         |                SELECT  rowkey,max(judicase_id) judicase_id
          |                FROM    $project.ads_judicial_case_relation_graph
          |                WHERE   flag = 'company_zxr'
-         |                GROUP BY id
+         |                GROUP BY rowkey
          |                  ) C
-         |        ON      A.detail_id = C.id
+         |        ON      A.detail_id = C.rowkey
          |        )
          |WHERE   num =1
          |""".stripMargin).show(10, false)
@@ -174,9 +174,9 @@ case class JudicialCaseRelationPre10(s: SparkSession, project: String
          |      ,NULL as yg_name
          |      ,A.cname as bg_name
          |      ,case_create_time as date--目前天眼查数据没有执行日期,先以此代替
-         |      ,rowkey as detail_id
+         |      ,A.rowkey as detail_id
          |      ,exec_money as case_amt
-         |      ,row_number() over(partition by rowkey,A.case_no order by update_time desc) num
+         |      ,row_number() over(partition by A.rowkey,A.case_no order by update_time desc) num
          |      from (
          |        select case_no,court,cname,case_create_time,rowkey,update_time,card,exec_money
          |        from $project.ads_company_zxr_person
@@ -201,12 +201,12 @@ case class JudicialCaseRelationPre10(s: SparkSession, project: String
          |      ) B
          |      on A.cname=B.name AND A.case_no=B.case_no
          |      left join(
-         |        SELECT  id,max(judicase_id) judicase_id
+         |        SELECT  rowkey,max(judicase_id) judicase_id
          |        FROM $project.ads_judicial_case_relation_graph
          |        WHERE flag = 'company_zxr_person'
-         |        GROUP BY id
+         |        GROUP BY rowkey
          |      ) C
-         |      on A.rowkey=C.id
+         |      on A.rowkey=C.rowkey
          |      where is_id_card(A.card) OR is_id_card(B.identity_num)
          |   )
          |where num = 1

+ 3 - 3
src/main/scala/com/winhc/bigdata/spark/jobs/judicial/JudicialCaseRelationPre39.scala

@@ -39,10 +39,10 @@ case class JudicialCaseRelationPre39(s: SparkSession,
 
       sql(
         s"""
-           |SELECT  id,max(judicase_id) judicase_id
+           |SELECT  rowkey,max(judicase_id) judicase_id
            |FROM    winhc_eci_dev.ads_judicial_case_relation_graph
            |WHERE   flag = '$table_name'
-           |group by id
+           |group by rowkey
            |""".stripMargin)
         .createOrReplaceTempView("all_judicial_mapping_tmp")
 
@@ -105,7 +105,7 @@ case class JudicialCaseRelationPre39(s: SparkSession,
            |              SELECT  *
            |              FROM    all_judicial_mapping_tmp
            |          ) AS t2
-           |ON      t1.detail_id = t2.id
+           |ON      t1.detail_id = t2.rowkey
            |""".stripMargin)
         .createOrReplaceTempView(s"ok_table_$table_name")
 

+ 3 - 3
src/main/scala/com/winhc/bigdata/spark/jobs/judicial/JudicialCaseRelationPreNew.scala

@@ -152,9 +152,9 @@ case class JudicialCaseRelationPreNew(s: SparkSession, project: String, ds: Stri
          |        ,case_id as detail_id
          |        ,case_amt
          |FROM    (
-         |            SELECT  id,max(judicase_id) judicase_id
+         |            SELECT  rowkey,max(judicase_id) judicase_id
          |            FROM $project.ads_judicial_case_relation_graph WHERE flag = 'wenshu_detail'
-         |            GROUP BY id
+         |            GROUP BY rowkey
          |        ) a
          |RIGHT JOIN (
          |            SELECT *,md5(cleanup(case_no_trim(case_no))) as new_judicase_id
@@ -166,7 +166,7 @@ case class JudicialCaseRelationPreNew(s: SparkSession, project: String, ds: Stri
          |            )c
          |            where num = 1
          |        ) b
-         |ON      a.id = b.case_id
+         |ON      a.rowkey = b.case_id
          |""".stripMargin).show(10, false)