|
|
|
@@ -205,12 +205,35 @@ public class MarkingDataReportServiceImpl implements MarkingDataReportService { |
|
|
|
vo.setVerifyCount(verifyCountMap.get(vo.getxTime()) == null ? 0 : verifyCountMap.get(vo.getxTime())); |
|
|
|
} |
|
|
|
|
|
|
|
String startdate = DateUtils.getTimeBefore(29, new Date()); |
|
|
|
String enddate = DateUtils.getTimeBefore(1,new Date()); |
|
|
|
List<String> tjTimeList = DateUtils.getTjTimeList(startdate, enddate, "0"); |
|
|
|
List<String> tjList = tjTimeList.stream().map(d -> d.substring(5).replace("-", "/")).collect(Collectors.toList()); |
|
|
|
List<MarkingSceneDataReportVo> tempDatalist =new LinkedList<>(); |
|
|
|
|
|
|
|
for(String tj:tjList){ |
|
|
|
Optional<MarkingSceneDataReportVo> first = list.stream().filter(c -> c.getxTime().equals(tj)).findFirst(); |
|
|
|
if(!first.isPresent()){ |
|
|
|
MarkingSceneDataReportVo markingSceneDataReportVo = new MarkingSceneDataReportVo(); |
|
|
|
markingSceneDataReportVo.setxTime(tj); |
|
|
|
markingSceneDataReportVo.setParkCount(0); |
|
|
|
markingSceneDataReportVo.setVerifyCount(0); |
|
|
|
markingSceneDataReportVo.setTempCount(0); |
|
|
|
markingSceneDataReportVo.setCarCount(0); |
|
|
|
markingSceneDataReportVo.setParkSendCount(0); |
|
|
|
markingSceneDataReportVo.setVerifySendCount(0); |
|
|
|
tempDatalist.add(markingSceneDataReportVo); |
|
|
|
continue; |
|
|
|
} |
|
|
|
tempDatalist.add(first.get()); |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
HashMap<String, Object> returnMap = new HashMap<>(); |
|
|
|
returnMap.put("sceneDownDay", sceneDownDay);//比昨日下降 |
|
|
|
returnMap.put("sceneUpWeek", sceneUpWeek);//比上周提升 |
|
|
|
returnMap.put("todaySceneCount", todaySceneCount);//今日领取数 |
|
|
|
returnMap.put("sceneDataMap", list); |
|
|
|
returnMap.put("sceneDataMap", tempDatalist); |
|
|
|
return returnMap; |
|
|
|
} |
|
|
|
|
|
|
|
|