Merge branch 'script_gj' into 'master'

过滤范围修改

See merge request !99
This commit is contained in:
2021-08-28 16:04:37 +08:00
@@ -416,8 +416,13 @@ class BigdataDealBatch extends BaseBatch{
def startPrice = null
def endPrice = null
if(price){
startPrice = (int)(price - price*0.1)
endPrice = (int)(price*0.5 + price)
if(dist.city=="上海"){
startPrice = (int)(price - price*0.1)
endPrice = (int)(price*0.5 + price)
}else{
startPrice = (int)(price - price*0.5)
endPrice = (int)(price*0.5 + price)
}
}
def trades = CcbCommonUtils.findTradesDetail(dist, startDate, endDate, startPrice, endPrice)
if(trades){
@@ -448,8 +453,15 @@ class BigdataDealBatch extends BaseBatch{
def price = statMap.get(obj.fjRegion+"@"+obj.fjName)
if(price){
def startPrice = (int)(price - price*0.1)
def endPrice= (int)(price*0.5 + price)
def startPrice = 0
def endPrice= 0
if(obj.fjCity=="上海"){
startPrice = (int)(price - price*0.1)
endPrice = (int)(price*0.5 + price)
}else{
startPrice = (int)(price - price*0.5)
endPrice = (int)(price*0.5 + price)
}
if(obj.price>=startPrice && obj.price<=endPrice){
rets << obj;
}