From 766fc8ab12fc79ae45d950787314b3832a0fdaf6 Mon Sep 17 00:00:00 2001 From: gaojuan1 Date: Tue, 27 Aug 2024 15:19:18 +0800 Subject: [PATCH] null --- .../fangjia/script/gj/data_handle/DevProcess.groovy | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/data_handle/DevProcess.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/data_handle/DevProcess.groovy index 87dc209ef..b7f3f0ae5 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/data_handle/DevProcess.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/data_handle/DevProcess.groovy @@ -201,7 +201,7 @@ class DevProcess { } def devSplitRoad(){ - def i = 0; + def i = 1; while(i<20){ def fileName = "/home/goojia/gj/qzd-${i}.xlsx" if(CommonDatautils.isWindow()){ @@ -211,14 +211,14 @@ class DevProcess { File file=new File(fileName); if(file.exists()){ ExcelUtils.multiThreadingModify(fileName,{d-> - if(d['E'] && !d['R']){ + if(d['C'] && !d['R']){ def jsonObject1 = com.fangjia.script.gj.district.FangjiaClientUtils.formatNinelevel(d['B'], d['C']) if(jsonObject1) { if (jsonObject1.get("dev") && jsonObject1.get("dev") != "null") { def devName = jsonObject1.get("dev") def obj = findDev(d['B'], devName) d['F'] = devName - if(jsonObject1.containsKey("detail")){ + if(jsonObject1.containsKey("detail") && jsonObject1.detail.dev_confi!='null'){ d['U'] = jsonObject1.detail.dev_confi } if (obj) { @@ -260,7 +260,7 @@ class DevProcess { d['N'] = "信息不完整" } - if (!d['N'] && !d['C'].contains(road)) { + if (!d['N'] && d['C'] && !d['C'].contains(road)) { d['N'] = "原地址不含路" } @@ -286,7 +286,7 @@ class DevProcess { d['S'] = obj._id.toString() d['T'] = obj.name } - if(jsonObject.containsKey("detail")){ + if(jsonObject.containsKey("detail") && jsonObject.detail.dev_confi!='null'){ d['V'] = jsonObject.detail.dev_confi } }