| @@ -402,7 +402,30 @@ public class MarkingDataReportServiceImpl implements MarkingDataReportService { | |||||
| params.put("endTime", addDay(1)); | params.put("endTime", addDay(1)); | ||||
| List<TouchUsersReportVo> wxUserVisitList = wxUserVisitMapper.touchUsersReportData(params); | List<TouchUsersReportVo> wxUserVisitList = wxUserVisitMapper.touchUsersReportData(params); | ||||
| return wxUserVisitList; | |||||
| String startdate = DateUtils.getTimeBefore(30, 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<TouchUsersReportVo> tempDatalist =new LinkedList<>(); | |||||
| for(String tj:tjList){ | |||||
| Optional<TouchUsersReportVo> first = wxUserVisitList.stream().filter(c -> c.getxTime().equals(tj)).findFirst(); | |||||
| if(!first.isPresent()){ | |||||
| TouchUsersReportVo touchUsersReportVo = new TouchUsersReportVo(); | |||||
| touchUsersReportVo.setPv(0); | |||||
| touchUsersReportVo.setUv(0); | |||||
| touchUsersReportVo.setCouponCount(0); | |||||
| touchUsersReportVo.setUserCount(0); | |||||
| touchUsersReportVo.setVerifyCount(0); | |||||
| touchUsersReportVo.setVerifyUserCount(0); | |||||
| touchUsersReportVo.setxTime(tj); | |||||
| tempDatalist.add(touchUsersReportVo); | |||||
| continue; | |||||
| } | |||||
| tempDatalist.add(first.get()); | |||||
| } | |||||
| return tempDatalist; | |||||
| } | } | ||||