From 6b2436c5ef17aae9d260ba99686547efe1490787 Mon Sep 17 00:00:00 2001 From: gaojuan1 Date: Mon, 3 Nov 2025 10:09:33 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E5=8E=A6=E9=97=A8=E9=93=B6=E8=A1=8C?= =?UTF-8?q?=E8=B7=91=E6=89=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../script/gj/village/XiamenVillage.groovy | 47 +++++++++++++++++++ 1 file changed, 47 insertions(+) create mode 100644 projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/village/XiamenVillage.groovy 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; //县政府所在镇 + } + } + + }) + } +} From 3bf9b8dc68c39678d3243504d1c68182669c6ae7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E6=96=87=E8=89=B3?= Date: Wed, 5 Nov 2025 17:56:53 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BC=B0=E5=80=BC?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../open/controllers/PropertyController.java | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) 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) {