晏永年 4 years ago
parent
commit
295343f8b8

+ 62 - 32
src/main/scala/com/winhc/bigdata/spark/jobs/judicial/JudicialCaseRelationPre456.scala

@@ -163,7 +163,7 @@ case class JudicialCaseRelationPre456(s: SparkSession, project: String
          |    ,company_info
          |    ,source
          |    ,status
-         |    ,case_create_time
+         |    ,A.appro_time AS appro_time
          |    ,A.create_time AS create_time
          |    ,A.update_time AS update_time
          |    ,A.deleted AS deleted
@@ -234,7 +234,7 @@ case class JudicialCaseRelationPre456(s: SparkSession, project: String
          |    ,A.company_info
          |    ,A.source
          |    ,A.status
-         |    ,A.case_create_time
+         |    ,A.appro_time
          |    ,A.create_time
          |    ,A.update_time
          |    ,A.deleted
@@ -265,36 +265,66 @@ case class JudicialCaseRelationPre456(s: SparkSession, project: String
       s"""
          |--先从前面结果表获取
          |INSERT OVERWRITE TABLE winhc_eci_dev.ads_company_zxr_restrict_person_cloze PARTITION(ds=$lastDsIncAds)
-         |SELECT A.rowkey
-         |    ,IF(A.identity_num IS NULL AND D.identity_num IS NOT NULL,3,0) AS flag
-         |    ,A.new_cid
-         |    ,A.cid
-         |    ,A.id
-         |    ,A.name_hid
-         |    ,A.name
-         |    ,A.sex
-         |    ,COALESCE(A.identity_num,D.identity_num) AS identity_num
-         |    ,A.court_name
-         |    ,A.court_code
-         |    ,A.case_create_time
-         |    ,A.case_no
-         |    ,A.content
-         |    ,A.oss_path
-         |    ,A.file_path
-         |    ,A.province
-         |    ,A.xgid
-         |    ,A.company_name
-         |    ,A.company_info
-         |    ,A.source
-         |    ,A.status
-         |    ,A.case_create_time
-         |    ,A.create_time
-         |    ,A.update_time
-         |    ,A.deleted
-         |FROM tmp_person_cloze_2 A
-         |LEFT JOIN
-         |tmp_person_cloze_2 D
-         |ON A.name=D.name AND (cleanup(A.company_name)=cleanup(D.company_name) OR (cleanup(A.company_info)=cleanup(D.company_info)))--根据实际数据情况
+         |SELECT rowkey
+         |  ,flag
+         |  ,new_cid
+         |  ,cid
+         |  ,id
+         |  ,name_hid
+         |  ,name
+         |  ,sex
+         |  ,identity_num
+         |  ,court_name
+         |  ,court_code
+         |  ,case_create_time
+         |  ,case_no
+         |  ,content
+         |  ,oss_path
+         |  ,file_path
+         |  ,province
+         |  ,xgid
+         |  ,company_name
+         |  ,company_info
+         |  ,source
+         |  ,status
+         |  ,appro_time
+         |  ,create_time
+         |  ,update_time
+         |  ,deleted
+         |FROM(
+         |  SELECT A.rowkey
+         |      ,IF(A.identity_num IS NULL AND D.identity_num IS NOT NULL,3,0) AS flag
+         |      ,A.new_cid
+         |      ,A.cid
+         |      ,A.id
+         |      ,A.name_hid
+         |      ,A.name
+         |      ,A.sex
+         |      ,COALESCE(A.identity_num,D.identity_num) AS identity_num
+         |      ,A.court_name
+         |      ,A.court_code
+         |      ,A.case_create_time
+         |      ,A.case_no
+         |      ,A.content
+         |      ,A.oss_path
+         |      ,A.file_path
+         |      ,A.province
+         |      ,A.xgid
+         |      ,A.company_name
+         |      ,A.company_info
+         |      ,A.source
+         |      ,A.status
+         |      ,A.appro_time
+         |      ,A.create_time
+         |      ,A.update_time
+         |      ,A.deleted
+         |      ,ROW_NUMBER() OVER (PARTITION BY A.name,A.case_no ORDER BY A.update_time DESC ) num
+         |  FROM tmp_person_cloze_2 A
+         |  LEFT JOIN
+         |  tmp_person_cloze_2 D
+         |  ON A.name=D.name AND (cleanup(A.company_name)=cleanup(D.company_name) OR (cleanup(A.company_info)=cleanup(D.company_info)))--根据实际数据情况
+         |)
+         |WHERE num=1
          |""".stripMargin
     )//.createOrReplaceTempView("tmp_person_cloze_3")