|
@@ -63,9 +63,11 @@ public class ProductLinePerformanceServiceImpl extends SuperCacheServiceImpl<Pro
|
|
|
int monthHour = calCalendar.getActualMaximum(Calendar.DATE) * 24;
|
|
|
params.setMonthHour(monthHour);
|
|
|
}else{
|
|
|
- Date SearchDate = com.github.zuihou.common.util.DateUtil.stringToDate0(params.getStatisticalDate(),"yyyy-MM");
|
|
|
+ Date searchDate = com.github.zuihou.common.util.DateUtil.stringToDate0(params.getStatisticalDate(),"yyyy-MM");
|
|
|
Calendar calCalendar = Calendar.getInstance();
|
|
|
- calCalendar.setTime(SearchDate);
|
|
|
+ if(searchDate != null){
|
|
|
+ calCalendar.setTime(searchDate);
|
|
|
+ }
|
|
|
int monthHour = calCalendar.getActualMaximum(Calendar.DATE) * 24;
|
|
|
params.setMonthHour(monthHour);
|
|
|
}
|