|
@@ -70,11 +70,11 @@ case class IDCard_Completion_Utils(s: SparkSession,
|
|
|
s"""
|
|
|
|SELECT ${m._2._2} AS name, ${m._2._3} AS identity_num, ${m._2._4} AS company_name, ${m._2._5} AS case_no, ${m._2._6} AS court_name, ${m._2._7} AS source, ${m._2._7} AS flag
|
|
|
|FROM $project.ods_${m._1}
|
|
|
- |WHERE ds>'0' AND is_id_card${m._2._3}//严格限制必须有符合要求的身份证号码
|
|
|
+ |WHERE ds>'0' AND is_id_card(${m._2._3})
|
|
|
|UNION ALL
|
|
|
|SELECT ${m._2._2} AS name, ${m._2._3} AS identity_num, ${m._2._4} AS company_name, ${m._2._5} AS case_no, ${m._2._6} AS court_name, ${m._2._7} AS source, ${m._2._7} AS flag
|
|
|
|FROM $project.inc_ods_${m._1}
|
|
|
- |WHERE ds>'0' AND is_id_card${m._2._3}//严格限制必须有符合要求的身份证号码
|
|
|
+ |WHERE ds>'0' AND is_id_card(${m._2._3})
|
|
|
|""".stripMargin
|
|
|
}).toArray.mkString(" UNION ALL ")
|
|
|
).where("name IS NOT NULL AND case_no IS NOT NULL AND LENGTH(name)>0 AND LENGTH(case_no)>0")
|
|
@@ -117,7 +117,7 @@ case class IDCard_Completion_Utils(s: SparkSession,
|
|
|
| ON A.name=B.name AND A.company_name=B.company_name
|
|
|
| )
|
|
|
|)
|
|
|
- |WHERE num=1 AND is_id_card(identity_num)--必须是规范的身份证号码
|
|
|
+ |WHERE num=1 AND is_id_card(identity_num)
|
|
|
|""".stripMargin
|
|
|
)
|
|
|
// CompanyIncSummary(spark, project, tableName, "new_cid", dupliCols).calc
|