Merge branch 'script_gj' into 'master'

null

See merge request !936
This commit is contained in:
2024-08-27 15:19:58 +08:00
@@ -201,7 +201,7 @@ class DevProcess {
} }
def devSplitRoad(){ def devSplitRoad(){
def i = 0; def i = 1;
while(i<20){ while(i<20){
def fileName = "/home/goojia/gj/qzd-${i}.xlsx" def fileName = "/home/goojia/gj/qzd-${i}.xlsx"
if(CommonDatautils.isWindow()){ if(CommonDatautils.isWindow()){
@@ -211,14 +211,14 @@ class DevProcess {
File file=new File(fileName); File file=new File(fileName);
if(file.exists()){ if(file.exists()){
ExcelUtils.multiThreadingModify(fileName,{d-> 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']) def jsonObject1 = com.fangjia.script.gj.district.FangjiaClientUtils.formatNinelevel(d['B'], d['C'])
if(jsonObject1) { if(jsonObject1) {
if (jsonObject1.get("dev") && jsonObject1.get("dev") != "null") { if (jsonObject1.get("dev") && jsonObject1.get("dev") != "null") {
def devName = jsonObject1.get("dev") def devName = jsonObject1.get("dev")
def obj = findDev(d['B'], devName) def obj = findDev(d['B'], devName)
d['F'] = devName d['F'] = devName
if(jsonObject1.containsKey("detail")){ if(jsonObject1.containsKey("detail") && jsonObject1.detail.dev_confi!='null'){
d['U'] = jsonObject1.detail.dev_confi d['U'] = jsonObject1.detail.dev_confi
} }
if (obj) { if (obj) {
@@ -260,7 +260,7 @@ class DevProcess {
d['N'] = "信息不完整" d['N'] = "信息不完整"
} }
if (!d['N'] && !d['C'].contains(road)) { if (!d['N'] && d['C'] && !d['C'].contains(road)) {
d['N'] = "原地址不含路" d['N'] = "原地址不含路"
} }
@@ -286,7 +286,7 @@ class DevProcess {
d['S'] = obj._id.toString() d['S'] = obj._id.toString()
d['T'] = obj.name d['T'] = obj.name
} }
if(jsonObject.containsKey("detail")){ if(jsonObject.containsKey("detail") && jsonObject.detail.dev_confi!='null'){
d['V'] = jsonObject.detail.dev_confi d['V'] = jsonObject.detail.dev_confi
} }
} }