Merge branch 'script_gj' into 'master'

update

See merge request !677
This commit is contained in:
2023-07-11 18:14:56 +08:00
@@ -287,25 +287,25 @@ class FiledStrand {
if (name.find('【')!=-1 && name.find('】')!=-1){
def rep_str = name[name.index('【'):name.rfind('】')+1]
def rep_str = name.subsring(name.index('【'),name.rfind('】')+1)
name = name.replace(rep_str, '')
}
if (name.find('【')!=-1 && name.find('】')!=-1){
def rep_str = name[name.index('【'):name.rfind('】')+1]
def rep_str = name.subsring(name.index('【'),name.rfind('】')+1)
name = name.replace(rep_str, '')
}
if (name.find('(')!=-1 && name.find(')')!=-1){
def rep_str = name[name.index('('):name.rfind(')')+1]
def rep_str = name.subsring(name.index('('),name.rfind(')')+1)
name = name.replace(rep_str, '')
}
if (name.find('「')!=-1 && name.find('」')!=-1){
def rep_str = name[name.index('「'):name.rfind('」')+1]
def rep_str = name.subsring(name.index('「'),name.rfind('」')+1)
name = name.replace(rep_str, '')
}
return name
@@ -629,7 +629,7 @@ class FiledStrand {
println "estateCharege 转不了 "+estateCharege
}
}
return estateCharege;
return null;
}
static def processHouseholdCount(def household_count, def estateType2){