|
@@ -306,7 +306,10 @@ object BaseUtil {
|
|
|
new String(c)
|
|
|
}
|
|
|
|
|
|
+ @deprecated
|
|
|
private val case_pat = ".*([(\\(]\\d{4}[)\\)][^号]*号?).*".r
|
|
|
+
|
|
|
+ private val case_pat2 = "(((20\\d{2}|19\\d{2})|\\((20\\d{2}|19\\d{2})\\))[^号]{6,}号?).*".r
|
|
|
private val year_pat = "(\\d{4}?)年".r
|
|
|
|
|
|
/**
|
|
@@ -323,8 +326,8 @@ object BaseUtil {
|
|
|
case_no = year_pat.replaceAllIn(case_no, "\\($1\\)")
|
|
|
case_no = case_no.replace("(", "(")
|
|
|
.replace(")", ")")
|
|
|
- if (case_pat matches case_no) {
|
|
|
- case_pat.replaceAllIn(case_no, "$1")
|
|
|
+ if (case_pat2 matches case_no) {
|
|
|
+ case_pat2.replaceAllIn(case_no, "$1")
|
|
|
} else null
|
|
|
}
|
|
|
|
|
@@ -389,7 +392,7 @@ object BaseUtil {
|
|
|
// println(case_no_trim("(2015)怀执字第03601号号"))
|
|
|
// val seq = Seq("1", "3", "2", "7").mkString("\001")
|
|
|
// println(sortString(seq))
|
|
|
- println(is_id_card("4111111999****062x"))
|
|
|
+ println(case_no_trim("中国贸仲京裁字第0394号"))
|
|
|
}
|
|
|
|
|
|
}
|