|
@@ -11,6 +11,7 @@ import org.jeecg.modules.bytedance.advertise.entity.ByteDanceAdvertisePlan;
|
|
import org.jeecg.modules.bytedance.advertise.entity.RuleDataAccount;
|
|
import org.jeecg.modules.bytedance.advertise.entity.RuleDataAccount;
|
|
import org.jeecg.modules.bytedance.advertise.mapper.AiBytedanceAdvertiserStrategyMapper;
|
|
import org.jeecg.modules.bytedance.advertise.mapper.AiBytedanceAdvertiserStrategyMapper;
|
|
import org.jeecg.modules.bytedance.advertise.mapper.ByteDanceAdvertisePlanMapper;
|
|
import org.jeecg.modules.bytedance.advertise.mapper.ByteDanceAdvertisePlanMapper;
|
|
|
|
+import org.jeecg.modules.bytedance.advertise.vo.IndustryVo;
|
|
import org.jeecg.modules.bytedance.common.utils.Check;
|
|
import org.jeecg.modules.bytedance.common.utils.Check;
|
|
import org.jeecg.modules.bytedance.report.entity.BytedanceAdvertiserHourlyReport;
|
|
import org.jeecg.modules.bytedance.report.entity.BytedanceAdvertiserHourlyReport;
|
|
import org.jeecg.modules.bytedance.report.entity.vo.ReportCostVo;
|
|
import org.jeecg.modules.bytedance.report.entity.vo.ReportCostVo;
|
|
@@ -206,7 +207,12 @@ public class BytedanceAdvertiserHourlyReportServiceImpl extends ServiceImpl<Byte
|
|
list.add(vo);
|
|
list.add(vo);
|
|
});
|
|
});
|
|
}
|
|
}
|
|
- Collections.sort(list,Comparator.comparing(ReportCostVo::getTime));
|
|
|
|
|
|
+ //排序
|
|
|
|
+ if ("0".equals(daysBetween)){
|
|
|
|
+ list.sort((ReportCostVo vo1, ReportCostVo vo2) -> Integer.valueOf(vo1.getTime()).compareTo(Integer.valueOf(vo2.getTime())));
|
|
|
|
+ }else {
|
|
|
|
+ Collections.sort(list,Comparator.comparing(ReportCostVo::getTime));
|
|
|
|
+ }
|
|
return list;
|
|
return list;
|
|
}
|
|
}
|
|
|
|
|