diff --git a/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/PropertyController.java b/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/PropertyController.java index fdec48ff0..18270c8ab 100644 --- a/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/PropertyController.java +++ b/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/PropertyController.java @@ -1196,9 +1196,18 @@ public class PropertyController { int orgAvgPrice = 0; if (districtStatBo != null) { if (StringUtils.isNotBlank(district.getEstateType2()) && district.getEstateType2().contains("别墅") && districtStatBo.getVillaDistrictStat() != null) { - orgAvgPrice = districtStatBo.getVillaDistrictStat().getAvgPrice(); + if(districtStatBo.getVillaDistrictStat().getAvg_price_2b() != null && districtStatBo.getVillaDistrictStat().getAvg_price_2b() > 0){ + orgAvgPrice = districtStatBo.getVillaDistrictStat().getAvg_price_2b(); + }else{ + orgAvgPrice = districtStatBo.getVillaDistrictStat().getAvgPrice(); + } + } else if (districtStatBo.getDistrictStat() != null) { - orgAvgPrice = districtStatBo.getDistrictStat().getAvgPrice(); + if(districtStatBo.getDistrictStat().getAvg_price_2b() != null && districtStatBo.getDistrictStat().getAvg_price_2b() > 0){ + orgAvgPrice = districtStatBo.getDistrictStat().getAvg_price_2b(); + }else{ + orgAvgPrice = districtStatBo.getDistrictStat().getAvgPrice(); + } } } if (evaluation != null && evaluation.getAvgPrice() != null && evaluation.getAvgPrice() > 0) { diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/village/XiamenVillage.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/village/XiamenVillage.groovy new file mode 100644 index 000000000..6d8badbb2 --- /dev/null +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/village/XiamenVillage.groovy @@ -0,0 +1,47 @@ +package com.fangjia.script.gj.village + +import com.fangjia.script.gj.OpenApiUtils +import com.fangjia.script.util.ExcelUtils + +class XiamenVillage { + static main(args) { + def task = new XiamenVillage(); + task.run() + } + + def run(){ + ExcelUtils.multiThreadingModify("D:\\数据\\厦门\\涉农组织类型判定(to估家,2025-09-30)-结果.xlsx",{ d-> + + if(!d['R']){ + def dto = OpenApiUtils.addrVerifyXiameng(null, d['B'], 2) + if(dto){ +// def dto = jsonObj.result + d['F'] = dto.province + d['G'] = dto.provinceCode + d['H'] = dto.city + d['I'] = dto.cityCode; + d['J'] = dto.district + d['K'] = dto.districtCode + d['L'] = dto.town + d['M'] = dto.townCode + d['N'] = dto.committee + d['O'] = dto.committeeCode + d['P'] = dto.typeCode + d['Q'] = dto.typeName + d['R'] = dto.verifyFlag//涉农标识 + d['S'] = dto.addrVerify//地址是否有效信息 + d['T'] = dto.countyLevelCity//是否为县级市 + d['U'] = dto.countyGov//是否为县政府 + d['V'] = dto.addrArea //所属区域 农村区域 城市区域 县城城区(对公) + d['W'] = dto.devDistrict//是否为开发区 + d['X'] = dto.devDistrictName//开发区 + d['Y'] = dto.devLevel//开发区等级 + d['Z']= dto.administrativeTowns;//是否市辖建制 + d['AA'] = dto.prefectureLevelOrAbove ;// 是否为地级市以上行政区划 + d['AB'] = dto.countyGovTown; //县政府所在镇 + } + } + + }) + } +}