|
@@ -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"))
|