|
|
|
@ -52,11 +52,11 @@ public class AnalysisServiceImpl implements AnalysisService {
|
|
|
|
|
// 不传入结束时间默认今天
|
|
|
|
|
Date endTime = dto.getEndTime() != null ?
|
|
|
|
|
dto.getEndTime()
|
|
|
|
|
: DateUtil.beginOfDay(DateUtil.date());
|
|
|
|
|
: DateUtil.beginOfDay(DateUtil.date());
|
|
|
|
|
// 开始时间为空将往前一周
|
|
|
|
|
Date startTime = dto.getStartTime() != null ?
|
|
|
|
|
dto.getStartTime()
|
|
|
|
|
: DateUtil.beginOfDay(DateUtil.offsetDay(DateUtil.date(), 7));
|
|
|
|
|
: DateUtil.beginOfDay(DateUtil.offsetDay(DateUtil.date(), 7));
|
|
|
|
|
String formatDate = DateUtil.formatDate(startTime);
|
|
|
|
|
Integer deliveryQuantity = dto.getDeliveryQuantity();
|
|
|
|
|
Long between = DateUtil.between(startTime, endTime, DateUnit.DAY);
|
|
|
|
@ -110,7 +110,7 @@ public class AnalysisServiceImpl implements AnalysisService {
|
|
|
|
|
break;
|
|
|
|
|
case 4:
|
|
|
|
|
// VIVO
|
|
|
|
|
sqlString = SqlConstant.PARSE_DATA_SQL.replaceAll(SqlConstant.TABLE_STR, TableEnum.VIVO.getTableName());
|
|
|
|
|
sqlString = SqlConstant.PARSE_DATA_SQL.replaceAll(SqlConstant.TABLE_STR, TableEnum.VV.getTableName());
|
|
|
|
|
break;
|
|
|
|
|
case 5:
|
|
|
|
|
//百度
|
|
|
|
|