From 86fd54d3923a4a76f2285d42d91f7a8f78e1875f Mon Sep 17 00:00:00 2001 From: "zhaojixiang@fangjia.com" Date: Fri, 7 Jul 2023 09:13:37 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E6=A5=BC=E6=A0=8B=E7=B3=BB=E6=95=B0?= =?UTF-8?q?=E7=AE=A1=E7=90=86=E5=A2=9E=E5=8A=A0=E5=88=9B=E5=BB=BA=E4=BA=BA?= =?UTF-8?q?=E5=92=8C=E5=A4=87=E6=B3=A8=E5=B1=9E=E6=80=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- projects/fangjia-bkoff/src/main/webapp/buildingRatio/edit.ftl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/projects/fangjia-bkoff/src/main/webapp/buildingRatio/edit.ftl b/projects/fangjia-bkoff/src/main/webapp/buildingRatio/edit.ftl index f11fc0866..7324e748f 100644 --- a/projects/fangjia-bkoff/src/main/webapp/buildingRatio/edit.ftl +++ b/projects/fangjia-bkoff/src/main/webapp/buildingRatio/edit.ftl @@ -57,7 +57,7 @@ 创建人 - + 备注 From 4d156c4926cac98c75c765184bcdae1ef8a293a5 Mon Sep 17 00:00:00 2001 From: "zhaojixiang@fangjia.com" Date: Fri, 7 Jul 2023 09:24:04 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E6=A5=BC=E6=A0=8B=E7=B3=BB=E6=95=B0?= =?UTF-8?q?=E7=AE=A1=E7=90=86=E5=A2=9E=E5=8A=A0=E5=88=9B=E5=BB=BA=E4=BA=BA?= =?UTF-8?q?=E5=92=8C=E5=A4=87=E6=B3=A8=E5=B1=9E=E6=80=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- projects/fangjia-bkoff/src/main/webapp/buildingRatio/edit.ftl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/projects/fangjia-bkoff/src/main/webapp/buildingRatio/edit.ftl b/projects/fangjia-bkoff/src/main/webapp/buildingRatio/edit.ftl index 7324e748f..4e058abd4 100644 --- a/projects/fangjia-bkoff/src/main/webapp/buildingRatio/edit.ftl +++ b/projects/fangjia-bkoff/src/main/webapp/buildingRatio/edit.ftl @@ -57,7 +57,7 @@ 创建人 - + 备注 From 0ee129219238f9c1f3b40db18b421c2c69671bff Mon Sep 17 00:00:00 2001 From: gaojuan Date: Fri, 7 Jul 2023 09:33:11 +0800 Subject: [PATCH 3/3] update --- .../fangjia/script/ccbevaluation/BigdataCommunityBatch.groovy | 4 ++-- .../script/ccbevaluation/ronghe/BigdataCitypriceBatch.groovy | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/ccbevaluation/BigdataCommunityBatch.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/ccbevaluation/BigdataCommunityBatch.groovy index 42feb5869..61b833dab 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/ccbevaluation/BigdataCommunityBatch.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/ccbevaluation/BigdataCommunityBatch.groovy @@ -56,8 +56,8 @@ class BigdataCommunityBatch extends BaseBatch{ def distCodeMap = CcbCommonUtils.findAllDistrictCodeValue(city) def dists = CcbCommonUtils.findAllDistrictByCity(city, "district", ["city","region", "name", "address","lat", "lng","all_area","build_area","virescence_percent","cubage_percent","car_site_count","finish_building_date","estate_type2","household_count","status","c_date","m_date","name_cat","street","street_number"]) -// def ccbMaps = CcbCommonUtils.findCcbDistrict(cityCodeDataMap.get(city)) //Èںϵ¼ÊýʱʹÓà - def ccbMaps = CcbCommonUtils.findPgCcbDistrict(cityCodeDataMap.get(city)) //¹ÀÖµµ¼ÊýʱʹÓà + def ccbMaps = CcbCommonUtils.findCcbDistrict(cityCodeDataMap.get(city)) //Èںϵ¼ÊýʱʹÓà +// def ccbMaps = CcbCommonUtils.findPgCcbDistrict(cityCodeDataMap.get(city)) //¹ÀÖµµ¼ÊýʱʹÓà def rets = createCityDatas(cityCodeDataMap, distCodeMap, dists) rets = addDeleteDist(dists, ccbMaps, rets) rows.addAll(rets) diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/ccbevaluation/ronghe/BigdataCitypriceBatch.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/ccbevaluation/ronghe/BigdataCitypriceBatch.groovy index 5a38c237e..ed89f59ac 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/ccbevaluation/ronghe/BigdataCitypriceBatch.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/ccbevaluation/ronghe/BigdataCitypriceBatch.groovy @@ -63,7 +63,7 @@ class BigdataCitypriceBatch extends BaseBatch{ def lastYearDate = DateUtils.addMonth(startDate.toString(),-12, "yyyyMMdd").toInteger(); cityRun(citys, startDate, endDate, cityCodeMap) regionRun(citys, startDate, endDate, cityCodeMap) - districtRun(citys, startDate, endDate, dealStartDate, lastYearDate, cityCodeMap) +// districtRun(citys, startDate, endDate, dealStartDate, lastYearDate, cityCodeMap) } def cityRun(citys, startDate, endDate, cityCodeDataMap){