Merge remote-tracking branch 'origin/master'

src/main/scala/com/winhc/bigdata/spark/jobs/CompanyWenshuDetailCombine.scala

@@ -145,15 +145,10 @@ case class CompanyWenshuDetailCombine(s: SparkSession,
         |            WHERE   num = 1
         |        ) e
         |JOIN    (
-        |            SELECT  *
-        |            FROM    (
-        |                        SELECT  *
-        |                                ,ROW_NUMBER() OVER(PARTITION BY CLEANUP(cname) ORDER BY update_time DESC) num
-        |                        FROM    winhc_eci_dev.base_company_mapping
-        |                        WHERE   ds = '$mapDs'
-        |                    ) k
-        |            WHERE   num = 1
-        |            AND     length(CLEANUP(cname)) > 4
+        |           SELECT  cname,max(new_cid) new_cid
+        |           FROM    winhc_eci_dev.base_company_mapping
+        |           WHERE   ds = '$mapDs' AND length(CLEANUP(cname)) > 4 AND deleted ='0' AND company_type not in ('2','8')
+        |           GROUP BY  cname
         |        ) f
         |ON      CLEANUP(e.cname) = CLEANUP(f.cname)
         |""".stripMargin)

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

@@ -447,7 +447,7 @@ case class JudicialCaseRelationPreNew(s: SparkSession, project: String, ds: Stri
          |                                cname
          |                                ,concat_ws(',',collect_set(new_cid)) AS new_cid
          |                        FROM    $project.$t5
-         |                        WHERE   ds = '$t5_ds' AND length(cleanup(cname)) >4
+         |                        WHERE   ds = '$t5_ds' AND length(cleanup(cname)) >4 AND company_type not in ('2','8') AND deleted = '0'
          |                        GROUP BY cname
          |                     ) f
          |                ON      cleanup(e.name) = cleanup(f.cname)