Merge branch 'script_gj' into 'master'
update bug See merge request !594
This commit is contained in:
+3
-3
@@ -502,7 +502,7 @@ class BigdataCitypriceBatch extends BaseBatch{
|
|||||||
def dataMap = allLastYearMap.get(dist._id.toString())
|
def dataMap = allLastYearMap.get(dist._id.toString())
|
||||||
if(dataMap && dataMap.saleprice){
|
if(dataMap && dataMap.saleprice){
|
||||||
yoy = (sell_avg_price - dataMap.saleprice)*100/dataMap.saleprice
|
yoy = (sell_avg_price - dataMap.saleprice)*100/dataMap.saleprice
|
||||||
yoy = DataHandleUtils.getDoubleRound(2, markup)
|
yoy = DataHandleUtils.getDoubleRound(2, yoy)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
row << yoy
|
row << yoy
|
||||||
@@ -527,7 +527,7 @@ class BigdataCitypriceBatch extends BaseBatch{
|
|||||||
def dataMap = allLastYearMap.get(dist._id.toString())
|
def dataMap = allLastYearMap.get(dist._id.toString())
|
||||||
if(dataMap && dataMap.salecount){
|
if(dataMap && dataMap.salecount){
|
||||||
yoy = (sell_count - dataMap.salecount)*100/dataMap.salecount
|
yoy = (sell_count - dataMap.salecount)*100/dataMap.salecount
|
||||||
yoy = DataHandleUtils.getDoubleRound(2, markup)
|
yoy = DataHandleUtils.getDoubleRound(2, yoy)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
row << yoy
|
row << yoy
|
||||||
@@ -552,7 +552,7 @@ class BigdataCitypriceBatch extends BaseBatch{
|
|||||||
def dataMap = allLastYearMap.get(dist._id.toString())
|
def dataMap = allLastYearMap.get(dist._id.toString())
|
||||||
if(dataMap && dataMap.salecount && dataMap.rentcount>0){
|
if(dataMap && dataMap.salecount && dataMap.rentcount>0){
|
||||||
yoy = (rent_count - dataMap.rentcount)*100/dataMap.rentcount
|
yoy = (rent_count - dataMap.rentcount)*100/dataMap.rentcount
|
||||||
yoy = DataHandleUtils.getDoubleRound(2, markup)
|
yoy = DataHandleUtils.getDoubleRound(2, yoy)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
row << yoy
|
row << yoy
|
||||||
|
|||||||
Reference in New Issue
Block a user