diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/trade/ImportIndexStats.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/trade/ImportIndexStats.groovy index e27cd6de4..f36ccec6a 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/trade/ImportIndexStats.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/trade/ImportIndexStats.groovy @@ -81,11 +81,11 @@ class ImportIndexStats extends BaseBatch{ def date = createDateString(year, month, 0, ""); s = DateUtils.addMonth(date, 1, "yyyyMM") - if(year==2024 && month==8){ + if(year==2024 && month==9){ stop = true; } calculatePriceIndex(year, month); - println "运行......"+date + println "运行......"+date+" 完成" } @@ -94,15 +94,15 @@ class ImportIndexStats extends BaseBatch{ def calculatePriceIndex(def year, def month){ def citys =CommonDatautils.findAllCity(); def date = createDateString(year, month, 0, ""); - def haveIndexCitys = findPriceIndexCitys(date); + def haveIndexCitys = findPriceIndexCitys(date.toInteger()); def index = 0; if(citys){ for(def city : citys){ - if(cityList.contains(city)){ + if(haveIndexCitys.contains(city)){ continue; } - def id = findPriceIndex(city, date); + def id = findPriceIndex(city, date.toInteger()); if(id){//已计算 continue; } @@ -125,8 +125,10 @@ class ImportIndexStats extends BaseBatch{ result.cat = "district"; result.type = "城市" savePriceIndex(result); + println "${index}"+ result+" "; + }else{ + println "${index}"+ result+" "+city +" 无数据"; } - println "${index}"+ result; } } } @@ -523,7 +525,7 @@ class ImportIndexStats extends BaseBatch{ } def findPriceIndexCitys(def date){ DBObject q = new BasicDBObject(); - q.put("yearmonth", date.toInteger()); + q.put("yearmonth", date); q.put("cat", "district") DBObject keys = new BasicDBObject(); @@ -543,6 +545,7 @@ class ImportIndexStats extends BaseBatch{ DBObject q = new BasicDBObject(); q.put("yearmonth", date); q.put("city", city); + q.put("cat", "district"); DBObject keys = new BasicDBObject(); keys.put("city", 1)