Merge branch 'script_gj' into 'master'

福州地址别名放入别名中

See merge request !38
This commit is contained in:
2021-06-08 15:58:22 +08:00
@@ -37,7 +37,7 @@ class DistrictInfoExportBatch extends BaseBatch{
def headers = ["id","city","district","name","lng","lat","property_type","build_type","households",
"property_fee","car_site_count","property_life","house_property","open_date","finish_date",
"delivery_date","floor_area","build_area","plot_ratio","landscaping_ratio","developer","property_company",
"build_structure","building_count","alias","address", "addr_alias"]
"build_structure","building_count","alias","address"]
def ret = createDatas("福州")
def fileName = "/fzbank/output/FJW_COMM_"+curDate+".csv"
@@ -102,7 +102,7 @@ class DistrictInfoExportBatch extends BaseBatch{
row << rMap.estate_company
row << getBuildStructure(rMap.build_structure)//为空的,默认钢混
row << rMap.loudong_count
row << processAlias(rMap.alias)
row << processAlias(rMap.alias, rMap.addr_alias)
def addr = fzAddrMap.get(rMap.get("_id").toString());
if(addr){
@@ -110,22 +110,32 @@ class DistrictInfoExportBatch extends BaseBatch{
}else{
row << rMap.address
}
row << processAlias(rMap.addr_alias)
//row << processAlias(rMap.addr_alias)
result << row
}
}
return result
}
def processAlias(alias){
def processAlias(alias, def addr_alias){
def newAlias = []
if(alias){
def newAlias = []
for(def name : alias){
if(name && !name.contains("(") && !name.contains("、") && !name.contains("?") && !name.contains("(")){
newAlias << name
}
}
}
if(addr_alias){
for(def name : addr_alias){
if(name && !name.contains("(") && !name.contains("、") && !name.contains("?") && !name.contains("(")){
newAlias << name
}
}
}
if(newAlias){
return newAlias.join(",");
}
return null;