diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/xiamen/XiaMenVillageBatch.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/xiamen/XiaMenVillageBatch.groovy index 440f6b420..afb3aaf93 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/xiamen/XiaMenVillageBatch.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/xiamen/XiaMenVillageBatch.groovy @@ -25,32 +25,32 @@ class XiaMenVillageBatch extends BaseBatch{ def inFileName = "xmbank_"+monthStr+".xlsx" println "输入文件:"+inFileName+" 输出文件:"+outFileName def exists = checkFileExists(outFileName) -// if(!exists){ -// def rows = [] -// rows << ["序号","地址","判定后涉农组织类型(城市企业[不含县城企业]、农村企业、县城企业)","所属工业园区或经济开发区"] -// def rets = XmBankVillageFtpUtils.readExcelFile(inFileName) -// if(rets){ -// for(def row : rets){ -// if(row[1]){ -// def dto = OpenApiUtils.addrVerifyXiameng(null, row[1], 2) -// if(dto){ -// row[2] = dto.addrArea //所属区域 农村区域 城市区域 县城城区(对公) -// if(dto.devDistrictName){ -// row[3] = dto.devDistrictName//开发区 -// }else{ -// row[3] = "" -// } -// -// } -// } -// rows << row -// } -// } -// uploadExcel(rows, outFileName) -// println "新增文件,上传已完成" -// }else{ -// println "已存在 "+ DateUtil.formatByPattern(new Date(), "yyyy-MM-dd HH:mm:ss") -// } + if(!exists){ + def rows = [] + rows << ["序号","地址","判定后涉农组织类型(城市企业[不含县城企业]、农村企业、县城企业)","所属工业园区或经济开发区"] + def rets = XmBankVillageFtpUtils.readExcelFile(inFileName) + if(rets){ + for(def row : rets){ + if(row[1]){ + def dto = OpenApiUtils.addrVerifyXiameng(null, row[1], 2) + if(dto){ + row[2] = dto.addrArea //所属区域 农村区域 城市区域 县城城区(对公) + if(dto.devDistrictName){ + row[3] = dto.devDistrictName//开发区 + }else{ + row[3] = "" + } + + } + } + rows << row + } + } + uploadExcel(rows, outFileName) + println "新增文件,上传已完成" + }else{ + println "已存在 "+ DateUtil.formatByPattern(new Date(), "yyyy-MM-dd HH:mm:ss") + } }