From bcc788c1aa09fa796fab2eea7f872a58d10b0edf Mon Sep 17 00:00:00 2001 From: gaojuan Date: Sat, 7 Aug 2021 14:19:34 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ccbevaluation/BigdataDealBatch.groovy | 2 +- .../script/ccbevaluation/TradeStatLog.groovy | 64 ++++++++++--------- .../script/gj/location/LocationTest.groovy | 4 +- .../script/looplineinfo/InsidePolygon.groovy | 22 ++++--- 4 files changed, 49 insertions(+), 43 deletions(-) diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/ccbevaluation/BigdataDealBatch.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/ccbevaluation/BigdataDealBatch.groovy index 37b58553a..3a252731e 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/ccbevaluation/BigdataDealBatch.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/ccbevaluation/BigdataDealBatch.groovy @@ -402,7 +402,7 @@ class BigdataDealBatch extends BaseBatch{ startDate = DateUtils.getFirstDayOfMonth(DateUtils.parseFromTightByPattern("20210601", "yyyyMMdd"))//DateUtils.getFirstDayOfMonth(DateUtils.parseFromTightByPattern(curDate.toString(), "yyyyMMdd")) } - def endDate = DateUtils.getLastDayOfMonth(DateUtils.parseFromTightByPattern("20210601", "yyyyMMdd"))//DateUtils.getFirstDayOfMonth(new Date()) + def endDate = DateUtils.getLastDayOfMonth(DateUtils.parseFromTightByPattern("20210701", "yyyyMMdd"))//DateUtils.getFirstDayOfMonth(new Date()) for(def i=0;i total++ def ret = [] - if(third.zhugezhaofang_esf_price){ - ret << third.zhugezhaofang_esf_price + if(third.zhuge_avg_price){ + ret << third.zhuge_avg_price } - if(third.anjuke_esf_price){ - ret << third.anjuke_esf_price + if(third.anjuke_avg_price){ + ret << third.anjuke_avg_price } - if(third.soufang_esf_price){ - ret << third.soufang_esf_price + if(third.fang_avg_price){ + ret << third.fang_avg_price } - if(third.lianjia_esf_price){ - ret << third.lianjia_esf_price + if(third.lianjia_avg_price){ + ret << third.lianjia_avg_price } - if(third.cityhouse_esf_price){ - ret << third.cityhouse_esf_price + if(third.cityhouse_avg_price){ + ret << third.cityhouse_avg_price } - if(third.maitian_esf_price){ - ret << third.maitian_esf_price + if(third.maitian_avg_price){ + ret << third.maitian_avg_price } - if(third.beike_esf_price){ - ret << third.beike_esf_price + if(third.ke_avg_price){ + ret << third.ke_avg_price } - if(third.get("365house_esf_price")){ - ret << third.get("365house_esf_price") + if(third.taofang_avg_price){ + ret << third.taofang_avg_price } - if(third.zhongyuan_esf_price){ - ret << third.zhongyuan_esf_price + if(third.zhongyuan_avg_price){ + ret << third.zhongyuan_avg_price } - if(third.tuboshi_esf_price){ - ret << third.tuboshi_esf_price + if(third.tbs_avg_price){ + ret << third.tbs_avg_price } - if(third.qfang_esf_price){ - ret << third.qfang_esf_price + if(third.qfang_avg_price){ + ret << third.qfang_avg_price } - if(third.fangtan_esf_price){ - ret << third.fangtan_esf_price + if(third.fangtan_avg_price){ + ret << third.fangtan_avg_price } - if(third.fangduoduo_esf_price){ - ret << third.fangduoduo_esf_price + if(third.fangduoduo_avg_price){ + ret << third.fangduoduo_avg_price } - if(third.get("5i5j_esf_price")){ - ret << third.get("5i5j_esf_price") + if(third.wiwj_avg_price){ + ret << third.wiwj_avg_price } if(ret.size()==0){ diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/location/LocationTest.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/location/LocationTest.groovy index aaeb0cdef..7062f6c72 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/location/LocationTest.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/location/LocationTest.groovy @@ -350,7 +350,7 @@ class LocationTest { mapName = r.name address = r.address - if(r.district.contains(dist.region)){ + if(r.district && r.district.contains(dist.region)){ score = 9 }else { score = 5 @@ -385,7 +385,7 @@ class LocationTest { region = r.district mapName = r.name address = r.address - if(r.district.contains(dist.region)){ + if(r.district && r.district.contains(dist.region)){ score = 7 }else { score = 5 diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/looplineinfo/InsidePolygon.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/looplineinfo/InsidePolygon.groovy index 5a8586fb8..fd646bf20 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/looplineinfo/InsidePolygon.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/looplineinfo/InsidePolygon.groovy @@ -35,17 +35,21 @@ class InsidePolygon { public static List createPoint2(String points){ - String[] array = points.split(";"); + List list = new ArrayList(); - for(int i =0 ;i