java/zhihuishenqu.git

			@@ -1551,12 +1551,17 @@
			return vo;
			}

			public static void main(String[] args) {
			String time = "2022-02-02 - 2023-02-02";
			String[] split = time.split(" - ");
			System.out.println(split[0]);
			}
			@Override
			public List<AnalyticStatisticsTwoVo> analyticStatisticsTwo(AnalyticStatisticsQuery query, List<Complaint> complaints, SimpleDateFormat simpleDateFormat) {
			public List<AnalyticStatisticsTwoVo> analyticStatisticsTwo(String time, List<Complaint> complaints, SimpleDateFormat simpleDateFormat) {
			ArrayList<AnalyticStatisticsTwoVo> list = new ArrayList<>();
			try {
			if (StringUtils.isNotEmpty(query.getTime())) {
			String[] split = query.getTime().split(" - ");
			if (StringUtils.isNotEmpty(time)) {
			String[] split = time.split(" - ");
			Date parse = simpleDateFormat.parse(split[0] + " 00:00:00");
			Date parse1 = simpleDateFormat.parse(split[1] + " 23:59:59");
			complaints = complaints.stream().filter(e -> e.getCreateTime().getTime() <= parse1.getTime() && e.getCreateTime().getTime() >= parse.getTime()).collect(Collectors.toList());
			@@ -1587,7 +1592,7 @@
			}

			} else {
			String time = DateUtils.getBeforeDay(6) + " 00:00:00";
			time = DateUtils.getBeforeDay(6) + " 00:00:00";
			Date parse = simpleDateFormat.parse(time);
			// 近7天数据
			complaints = complaints.stream().filter(e -> e.getCreateTime().getTime() <= new Date().getTime() && e.getCreateTime().getTime() >= parse.getTime()).collect(Collectors.toList());
			@@ -1612,7 +1617,7 @@
			}

			@Override
			public List<AnalyticStatisticsThreeVo> analyticStatisticsThree(AnalyticStatisticsQuery query, List<Complaint> complaints) {
			public List<AnalyticStatisticsThreeVo> analyticStatisticsThree(Integer rank, List<Complaint> complaints) {
			Map<String, List<Complaint>> groupedByProblemType = complaints.stream()
			.collect(Collectors.groupingBy(Complaint::getProblemType));
			List<AnalyticStatisticsThreeVo> analyticStatisticsThreeVos = groupedByProblemType.entrySet().stream()
			@@ -1624,11 +1629,11 @@
			})
			.collect(Collectors.toList());
			analyticStatisticsThreeVos = analyticStatisticsThreeVos.stream().sorted(Comparator.comparing(AnalyticStatisticsThreeVo::getAllTotal).reversed()).collect(Collectors.toList());
			if (query.getRank() == null) {
			if (rank == null) {
			return analyticStatisticsThreeVos;
			} else if (query.getRank() == 5) {
			} else if (rank == 5) {
			return analyticStatisticsThreeVos.stream().limit(5).collect(Collectors.toList());
			} else if (query.getRank() == 10) {
			} else if (rank == 10) {
			return analyticStatisticsThreeVos.stream().limit(10).collect(Collectors.toList());
			}
			return Collections.emptyList();