diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/averager/InsertMonitorSquareRentCalcCommandBatch.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/averager/InsertMonitorSquareRentCalcCommandBatch.groovy index aaf5bf416..cec0e03a9 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/averager/InsertMonitorSquareRentCalcCommandBatch.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/averager/InsertMonitorSquareRentCalcCommandBatch.groovy @@ -49,6 +49,7 @@ class InsertMonitorSquareRentCalcCommandBatch extends BaseBatch { void process(Object args) { String cityParam = System.getProperty("city"); + String calcDate = System.getProperty("calcDate"); def cities = new ArrayList() if(StringUtils.isNotBlank(cityParam)){ cities = new ArrayList() @@ -59,7 +60,7 @@ class InsertMonitorSquareRentCalcCommandBatch extends BaseBatch { cities = ServerAreaMap.findAllCities() } println cities - Date weekend = getLastDayOfMonth() + Date weekend = getLastDayOfMonth(calcDate) println weekend int cityCount = 0 int regionCount = 0 @@ -326,7 +327,13 @@ class InsertMonitorSquareRentCalcCommandBatch extends BaseBatch { } - private Date getLastDayOfMonth() { + private Date getLastDayOfMonth(String calcDateStr) { + if(StringUtils.isNotBlank(calcDateStr)){ + Date calcDate = DateUtil.parseDate(calcDateStr, "yyyyMM") + if(calcDate != null){ + return DateUtil.truncateDay(DateUtil.getLastDayOfMonth(calcDate, 0)) + } + } return DateUtil.truncateDay(DateUtil.getLastDayOfMonth(new Date(), -1)); }