瀏覽代碼

案由统一

xufei 3 年之前
父節點
當前提交
6368fa31db

+ 1 - 1
src/main/scala/com/winhc/bigdata/spark/ng/judicial/JudicialCaseRelationAggs.scala

@@ -592,7 +592,7 @@ case class JudicialCaseRelationAggs(s: SparkSession, project: String, args_case:
          |            SELECT   flag
          |                    ,title
          |                    ,case_type(case_no) case_type
-         |                    ,case_reason
+         |                    ,adjust_reason(case_reason) case_reason
          |                    ,case_no_trim(case_no) as case_no
          |                    ,court_name
          |                    ,case_stage(case_no) case_stage

+ 4 - 0
src/main/scala/com/winhc/bigdata/spark/udf/CompanyMapping.scala

@@ -103,6 +103,10 @@ trait CompanyMapping {
       combine_id(rw1, rw2)
     })
 
+    spark.udf.register("adjust_reason", (reason: String) => {
+      adjust_reason(reason)
+    })
+
 
   }
 

+ 11 - 4
src/main/scala/com/winhc/bigdata/spark/utils/BaseUtil.scala

@@ -693,18 +693,25 @@ object BaseUtil {
 
   def combine_id(rw1: String, rw2: String): String = {
     val listBuffer = new ListBuffer[String]()
-    if(StringUtils.isNotBlank(rw1)){
+    if (StringUtils.isNotBlank(rw1)) {
       listBuffer.append(rw1)
     }
-    if(StringUtils.isNotBlank(rw2)){
+    if (StringUtils.isNotBlank(rw2)) {
       listBuffer.append(rw2)
     }
     listBuffer.toList.sorted.mkString("_")
   }
 
+  def adjust_reason(reason: String): String = {
+    if (StringUtils.isBlank(reason)) return ""
+    if (reason.equals("其他")) return "其它"
+    reason
+  }
+
   def main(args: Array[String]): Unit = {
-    println(combine_id("111",""))
-    println(combine_id(null,""))
+    println(adjust_reason("其他"))
+    println(adjust_reason("其它"))
+    println(combine_id(null, ""))
     println(add_pre("123"))
     println(remove_pre("1_123"))
     println(flag_tn("10"))