|
@@ -14,6 +14,7 @@ import com.github.zuihou.database.mybatis.conditions.query.LbqWrapper;
|
|
|
import com.github.zuihou.injection.annonation.InjectionResult;
|
|
|
import com.github.zuihou.utils.BeanPlusUtil;
|
|
|
import lombok.extern.slf4j.Slf4j;
|
|
|
+import org.apache.commons.lang.StringUtils;
|
|
|
import org.springframework.stereotype.Service;
|
|
|
import org.springframework.transaction.annotation.Transactional;
|
|
|
|
|
@@ -63,9 +64,9 @@ 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");
|
|
|
Calendar calCalendar = Calendar.getInstance();
|
|
|
- if(searchDate != null){
|
|
|
+ if(StringUtils.isNotEmpty(params.getStatisticalDate())){
|
|
|
+ Date searchDate = com.github.zuihou.common.util.DateUtil.stringToDate0(params.getStatisticalDate(),"yyyy-MM");
|
|
|
calCalendar.setTime(searchDate);
|
|
|
}
|
|
|
int monthHour = calCalendar.getActualMaximum(Calendar.DATE) * 24;
|