|
@@ -38,7 +38,7 @@ public class BytedanceReportMaterialDailyServiceImpl extends ServiceImpl<Bytedan
|
|
|
PageHelper.startPage(pageNum,pageSize);
|
|
|
List<Map<String, Object>> dailyReportList = bytedanceReportMaterialDailyMapper.selectMaterialDailyReportByAccountId(accountId, startTime, endTime);
|
|
|
|
|
|
- Date maxStatDatetime = null;
|
|
|
+ Date maxUpdateTime = null;
|
|
|
|
|
|
for (Map<String, Object> dailyReportMap: dailyReportList) {
|
|
|
if(dailyReportMap == null || dailyReportMap.isEmpty()){
|
|
@@ -47,8 +47,8 @@ public class BytedanceReportMaterialDailyServiceImpl extends ServiceImpl<Bytedan
|
|
|
|
|
|
|
|
|
|
|
|
- if(Check.isNull(maxStatDatetime) || maxStatDatetime.before(DateUtils.str2Date(dailyReportMap.get("statDatetime").toString(),new SimpleDateFormat("yyyy-MM-dd")))){
|
|
|
- maxStatDatetime = DateUtils.str2Date(dailyReportMap.get("statDatetime").toString(),new SimpleDateFormat("yyyy-MM-dd"));
|
|
|
+ if(Check.isNull(maxUpdateTime) || maxUpdateTime.before(DateUtils.str2Date(dailyReportMap.get("updateTime").toString(),new SimpleDateFormat("yyyy-MM-dd HH:mm:ss")))){
|
|
|
+ maxUpdateTime = DateUtils.str2Date(dailyReportMap.get("updateTime").toString(),new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"));
|
|
|
}
|
|
|
|
|
|
if(dailyReportMap.get("count") == null){
|
|
@@ -88,8 +88,8 @@ public class BytedanceReportMaterialDailyServiceImpl extends ServiceImpl<Bytedan
|
|
|
}
|
|
|
|
|
|
for (Map<String, Object> dailyReportMap: dailyReportList) {
|
|
|
- if(!Check.isNull(maxStatDatetime)){
|
|
|
- dailyReportMap.put("statDatetime",maxStatDatetime);
|
|
|
+ if(!Check.isNull(maxUpdateTime)){
|
|
|
+ dailyReportMap.put("updateTime",maxUpdateTime);
|
|
|
}
|
|
|
|
|
|
}
|