Merge remote-tracking branch 'origin/master'

This commit is contained in:
majintao
2024-07-12 10:45:05 +08:00
2 changed files with 7 additions and 6 deletions
@@ -86,7 +86,8 @@ class GuiDingPriceBatch extends BaseBatch{
}
def headers = []//["第三方均价ID","楼盘ID","小区名称","城市ID","城市名称","行政区ID","行政区名称","指导日期","指导价格","添加人","备注","创建时间","更新时间","来源公司"]
FileUtils.batchCreateFile(rows, "d:\\数据\\建行\\房产估值\\数据文件\\txt\\GUIDED_PRICE_GJ.dat", headers, "utf-8", false);
println "人工指导价总计:"+rows.size()
// FileUtils.batchCreateFile(rows, "d:\\数据\\建行\\房产估值\\数据文件\\txt\\GUIDED_PRICE_GJ.dat", headers, "utf-8", false);
saveToPgSql(rows)
//
@@ -264,12 +264,12 @@ class DistrictSellStatBatch extends BaseBatch {
def dbcursor = DISTRICT_STAT.find(q).sort(new BasicDBObject().append("weekend", -1))
def priceMap = [:]
for(def d : dbcursor){
if(city == "福州"){
if(d.avg_price_2b && d.value_type!=1){
d.avg_price = d.avg_price_2b
if(!priceMap.containsKey(d.region +"##"+d.district_name+"##"+d.estate_type)){
if(city == "福州"){
if(d.avg_price_2b && d.value_type!=1){
d.avg_price = d.avg_price_2b
}
}
}
if(!priceMap.containsKey(d.region +"##"+d.district_name)){
priceMap.put(d.region +"##"+d.district_name+"##"+d.estate_type, d)
}
}