From 7f664dfefa22b22fc617a5fc44fe044c1f4aa144 Mon Sep 17 00:00:00 2001 From: gaojuan Date: Tue, 8 Aug 2023 13:52:33 +0800 Subject: [PATCH] update --- .../ronghe/BigdataCitypriceBatch.groovy | 4 ++-- .../script/fuzhou/DistrictSellStatBatch.groovy | 18 +++++++++--------- 2 files changed, 11 insertions(+), 11 deletions(-) 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 9ed8300cc..5a38c237e 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 @@ -61,8 +61,8 @@ class BigdataCitypriceBatch extends BaseBatch{ def dealStartDate = DateUtils.addMonth(DateUtils.parseFromTightByPattern(startDate.toString(), "yyyyMMdd"), -1) def lastYearDate = DateUtils.addMonth(startDate.toString(),-12, "yyyyMMdd").toInteger(); -// cityRun(citys, startDate, endDate, cityCodeMap) -// regionRun(citys, startDate, endDate, cityCodeMap) + cityRun(citys, startDate, endDate, cityCodeMap) + regionRun(citys, startDate, endDate, cityCodeMap) districtRun(citys, startDate, endDate, dealStartDate, lastYearDate, cityCodeMap) } diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/fuzhou/DistrictSellStatBatch.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/fuzhou/DistrictSellStatBatch.groovy index 24d6b09fe..3b25072f8 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/fuzhou/DistrictSellStatBatch.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/fuzhou/DistrictSellStatBatch.groovy @@ -160,15 +160,15 @@ class DistrictSellStatBatch extends BaseBatch { if(weekendPriceObj.value_type!=1){ if(dist.city == "¸£ÖÝ"){ -// if(Math.abs(mom)*100>3){ -// def randMarkup = nextDouble(0, 3) -// if(mom < 0){ -// mom = DataUtil.roundDouble(randMarkup*(-1)/100, 4) -// }else{ -// mom = DataUtil.roundDouble(randMarkup/100, 4) -// } -// curPrice = (int)(lastMonthPriceObj.avg_price*mom + lastMonthPriceObj.avg_price) -// } + if(Math.abs(mom)*100>3){ + def randMarkup = nextDouble(0, 3) + if(mom < 0){ + mom = DataUtil.roundDouble(randMarkup*(-1)/100, 4) + }else{ + mom = DataUtil.roundDouble(randMarkup/100, 4) + } + curPrice = (int)(lastMonthPriceObj.avg_price*mom + lastMonthPriceObj.avg_price) + } }else{ if(Math.abs(mom)*100>10){ def randMarkup = nextDouble(0, 10)