From bec697ac855da23c5d3e6c322ddfba31675a0fa1 Mon Sep 17 00:00:00 2001 From: gaojuan Date: Tue, 8 Jun 2021 16:43:33 +0800 Subject: [PATCH] =?UTF-8?q?=E7=A6=8F=E5=B7=9E=E5=9C=B0=E5=9D=80=E5=88=AB?= =?UTF-8?q?=E5=90=8D=E6=94=BE=E5=85=A5=E5=88=AB=E5=90=8D=E4=B8=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../fuzhou/DistrictInfoExportBatch.groovy | 22 ++++++++++++++----- 1 file changed, 16 insertions(+), 6 deletions(-) diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/fuzhou/DistrictInfoExportBatch.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/fuzhou/DistrictInfoExportBatch.groovy index 1af46cb50..042f94b43 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/fuzhou/DistrictInfoExportBatch.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/fuzhou/DistrictInfoExportBatch.groovy @@ -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;