晏永年 4 rokov pred
rodič
commit
22b37453f8

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

@@ -213,7 +213,7 @@ case class JudicialCaseRelationPre456(s: SparkSession, project: String
       s"""
          |--再从前面结果表获取
          |SELECT rowkey
-         |    ,IF(A.identity_num IS NULL AND C.card_num IS NOT NULL,2,0) AS flag
+         |    ,IF(A.identity_num IS NULL AND C.card_num IS NOT NULL,2,A.flag) AS flag
          |    ,A.new_cid
          |    ,A.cid
          |    ,A.id
@@ -293,7 +293,7 @@ case class JudicialCaseRelationPre456(s: SparkSession, project: String
          |  ,deleted
          |FROM(
          |  SELECT A.rowkey
-         |      ,IF(A.identity_num IS NULL AND D.identity_num IS NOT NULL,3,0) AS flag
+         |      ,IF(A.identity_num IS NULL AND D.identity_num IS NOT NULL,3,A.flag) AS flag
          |      ,A.new_cid
          |      ,A.cid
          |      ,A.id
@@ -318,7 +318,7 @@ case class JudicialCaseRelationPre456(s: SparkSession, project: String
          |      ,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
+         |      ,ROW_NUMBER() OVER (PARTITION BY A.name,A.case_no ORDER BY A.flag, A.identity_num, A.update_time DESC ) num
          |  FROM tmp_person_cloze_2 A
          |  LEFT JOIN
          |  tmp_person_cloze_2 D